Commit 1680d1d6 authored by phdeswer's avatar phdeswer

fix issues with ask setting not possible through dbus

Signed-off-by: phdeswer's avatarPhilippe De Swert <philippedeswert@gmail.com>
parent 17613ab2
AC_INIT([usb_moded], [0.38]) AC_INIT([usb_moded], [0.39])
AM_INIT_AUTOMAKE([-Wall -Werror foreign]) AM_INIT_AUTOMAKE([-Wall -Werror foreign])
AM_CONFIG_HEADER([config.h]) AM_CONFIG_HEADER([config.h])
......
usb-moded (0.39) unstable; urgency=low
* Add disconnect unbouncing timeout
* Ask mode is also a valid mode value for setting the settings.
* More aegis insanity. Fixes: NB#254713
-- Philippe De Swert <philippe.de-swert@nokia.com> Wed, 18 May 2011 20:04:12 +0300
usb-moded (0.38) unstable; urgency=low usb-moded (0.38) unstable; urgency=low
* Fix lintian warning * Fix lintian warning
...@@ -8,7 +16,7 @@ usb-moded (0.38) unstable; urgency=low ...@@ -8,7 +16,7 @@ usb-moded (0.38) unstable; urgency=low
* Remove dependency on glib 2.28.0, glib 2.24.2 is enough now. * Remove dependency on glib 2.28.0, glib 2.24.2 is enough now.
* Fix fallback mount options. Fixes: NB#255798 * Fix fallback mount options. Fixes: NB#255798
-- Philippe De Swert <philippe.de-swert@nokia.com> Mon May 16 13:06:17 EEST 2011 -- Philippe De Swert <philippe.de-swert@nokia.com> Mon, 16 May 2011 13:06:17 +0300
usb-moded (0.37) unstable; urgency=low usb-moded (0.37) unstable; urgency=low
......
...@@ -26,14 +26,8 @@ ...@@ -26,14 +26,8 @@
</node> </node>
</dbus> </dbus>
</provide> </provide>
<request> <request policy="add">
<credential name="usb-moded-dbus-bind" /> <credential name="usb-moded-dbus-bind" />
<credential name="CAP::sys_admin" />
<credential name="CAP::sys_module" />
<credential name="CAP::net_admin" />
<credential name="CAP::sys_ptrace" />
<credential name="CAP::kill" />
<credential name="CAP::dac_override" />
<for path="/usr/sbin/usb_moded" /> <for path="/usr/sbin/usb_moded" />
</request> </request>
</aegis> </aegis>
......
...@@ -37,6 +37,7 @@ ...@@ -37,6 +37,7 @@
#include "usb_moded-gconf-private.h" #include "usb_moded-gconf-private.h"
#include "usb_moded-modes.h" #include "usb_moded-modes.h"
#include "usb_moded-log.h" #include "usb_moded-log.h"
#include "usb_moded.h"
/** Get the config option set in gconf for the default action /** Get the config option set in gconf for the default action
* *
...@@ -71,7 +72,7 @@ int set_mode_setting(const char *mode) ...@@ -71,7 +72,7 @@ int set_mode_setting(const char *mode)
{ {
GConfClient *gclient = NULL; GConfClient *gclient = NULL;
if(!strcmp(mode, MODE_MASS_STORAGE) || !strcmp(mode, MODE_OVI_SUITE) || !strcmp(mode, MODE_CHARGING) || !strcmp(mode, MODE_ASK)|| !strcmp(mode, MODE_WINDOWS_NET)) if(!valid_mode(mode) || !strcmp(mode, MODE_ASK))
{ {
gclient = gconf_client_get_default(); gclient = gconf_client_get_default();
if (gclient == NULL) if (gclient == NULL)
......
...@@ -94,11 +94,6 @@ void set_usb_connected(gboolean connected) ...@@ -94,11 +94,6 @@ void set_usb_connected(gboolean connected)
if(connected) if(connected)
{ {
if(debounce)
{
g_source_remove(debounce);
debounce = 0;
}
/* do not go through the routine if already connected to avoid /* do not go through the routine if already connected to avoid
spurious load/unloads due to faulty signalling spurious load/unloads due to faulty signalling
NOKIA: careful with devicelock NOKIA: careful with devicelock
...@@ -106,6 +101,11 @@ void set_usb_connected(gboolean connected) ...@@ -106,6 +101,11 @@ void set_usb_connected(gboolean connected)
if(current_mode.connected) if(current_mode.connected)
return; return;
if(debounce)
{
g_source_remove(debounce);
debounce = 0;
}
#ifdef NOKIA #ifdef NOKIA
if(timeout_source) if(timeout_source)
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment