diff options
| author | Conor Curran <conor.curran@canonical.com> | 2011-07-25 18:42:24 +0100 |
|---|---|---|
| committer | Conor Curran <conor.curran@canonical.com> | 2011-07-25 18:42:24 +0100 |
| commit | 6dce39846999951353c2e866019a79d568c99dfa (patch) | |
| tree | 80e5c881b57f25be08b6e4991421281ac662447c /src/device-menu-mgr.c | |
| parent | a1a7357b58d182e077ebfe8fb11c083e5eb18839 (diff) | |
| download | ayatana-indicator-session-6dce39846999951353c2e866019a79d568c99dfa.tar.gz ayatana-indicator-session-6dce39846999951353c2e866019a79d568c99dfa.tar.bz2 ayatana-indicator-session-6dce39846999951353c2e866019a79d568c99dfa.zip | |
the beginnings of the udev work
Diffstat (limited to 'src/device-menu-mgr.c')
| -rw-r--r-- | src/device-menu-mgr.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 324b3f1..063045e 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -27,7 +27,7 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "lock-helper.h" #include "upower-client.h" #include "apt-watcher.h" - +#include "udev-mgr.h" #define UP_ADDRESS "org.freedesktop.UPower" #define UP_OBJECT "/org/freedesktop/UPower" @@ -41,6 +41,7 @@ struct _DeviceMenuMgr DbusmenuMenuitem* root_item; SessionDbus* session_dbus_interface; AptWatcher* apt_watcher; + UdevMgr* udev_mgr; }; static GConfClient *gconf_client = NULL; @@ -214,7 +215,6 @@ machine_sleep_with_context (DeviceMenuMgr* self, gchar* type) screensaver_throttle(type); lock_if_possible (self); - dbus_g_proxy_begin_call(up_main_proxy, type, sleep_response, @@ -681,7 +681,9 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self) restart_shutdown_logout_mi->logout_mi = logout_mi; restart_shutdown_logout_mi->shutdown_mi = shutdown_mi; - update_menu_entries(restart_shutdown_logout_mi); + update_menu_entries(restart_shutdown_logout_mi); + // Time to create the udev mgr and hand it the static relevant items. + self->udev_mgr = udev_mgr_new (webcam_menuitem, scanners_menuitem); } |