diff options
author | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-23 19:18:13 +0100 |
---|---|---|
committer | Sebastien Bacher <seb128@ubuntu.com> | 2012-02-23 19:18:13 +0100 |
commit | 94bfe45129f137cf747d25a66f3235939d4eb297 (patch) | |
tree | 33f620b4c3942dffd9e9d33d42fdef1ad879fab0 /src/device-menu-mgr.c | |
parent | 1d8f0ba5ee4fcd54f51ad8727429add3639d2444 (diff) | |
parent | 9bdc8031ccdd14ac1cb6ecb959210b8631059b77 (diff) | |
download | ayatana-indicator-session-94bfe45129f137cf747d25a66f3235939d4eb297.tar.gz ayatana-indicator-session-94bfe45129f137cf747d25a66f3235939d4eb297.tar.bz2 ayatana-indicator-session-94bfe45129f137cf747d25a66f3235939d4eb297.zip |
* New upstream release.
* Make GUDev dependency optional for non-Linux kernels
* Add accessibility strings on the icons (LP: #891861)
Diffstat (limited to 'src/device-menu-mgr.c')
-rw-r--r-- | src/device-menu-mgr.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index f8f0696..cfdb55d 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -31,7 +31,9 @@ with this program. If not, see <http://www.gnu.org/licenses/>. #include "apt-watcher.h" #endif /* HAVE_APT */ +#ifdef HAS_GUDEV #include "udev-mgr.h" +#endif /* HAS_GUDEV */ #define UP_ADDRESS "org.freedesktop.UPower" #define UP_OBJECT "/org/freedesktop/UPower" @@ -47,7 +49,9 @@ struct _DeviceMenuMgr #ifdef HAVE_APT AptWatcher* apt_watcher; #endif /* HAVE_APT */ +#ifdef HAS_GUDEV UdevMgr* udev_mgr; +#endif /* HAS_GUDEV */ }; static GSettings *lockdown_settings = NULL; @@ -733,8 +737,10 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self, gboolean greeter_mode) restart_shutdown_logout_mi->shutdown_mi = shutdown_mi; update_menu_entries(restart_shutdown_logout_mi); +#ifdef HAS_GUDEV // Time to create the udev mgr and hand it the static relevant items. self->udev_mgr = udev_mgr_new (scanners_menuitem, webcam_menuitem); +#endif } static void |