From 96137411b48cef5bd2228809e50dd6bd91cd2d2e Mon Sep 17 00:00:00 2001 From: Dmitry Shachnev Date: Wed, 26 Oct 2011 11:03:43 +0400 Subject: Swap return values of indicator_session_get_location --- src/indicator-session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 9510807..7c43935 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -277,10 +277,10 @@ indicator_session_get_location (IndicatorObject * io, { IndicatorSession * self = INDICATOR_SESSION (io); if (entry == &self->users){ - return 1; + return 0; } else if (entry == &self->devices){ - return 0; + return 1; } g_warning ("IOEntry handed to us to position but we don't own it!"); return 0; -- cgit v1.2.3 From 7e6cd986af1e0885ac5424a359a6c104ca004936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marco=20Trevisan=20=28Trevi=C3=B1o=29?= Date: Tue, 8 Nov 2011 23:48:18 +0100 Subject: Export the indicators name hints Using the PACKAGE config.h variable both for the users and devices entries. --- src/indicator-session.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 9510807..ec49f0e 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -118,8 +118,8 @@ indicator_session_class_init (IndicatorSessionClass *klass) object_class->finalize = indicator_session_finalize; IndicatorObjectClass * io_class = INDICATOR_OBJECT_CLASS(klass); - io_class->get_entries = indicator_session_get_entries; - io_class->get_location = indicator_session_get_location; + io_class->get_entries = indicator_session_get_entries; + io_class->get_location = indicator_session_get_location; return; } @@ -140,6 +140,7 @@ indicator_session_init (IndicatorSession *self) GtkWidget* avatar_icon = NULL; // users + self->users.name_hint = PACKAGE"-users"; self->users.menu = GTK_MENU (dbusmenu_gtkmenu_new (INDICATOR_USERS_DBUS_NAME, INDICATOR_USERS_DBUS_OBJECT)); // Set the image to the default avator image @@ -169,7 +170,9 @@ indicator_session_init (IndicatorSession *self) const gchar *greeter_var; greeter_var = g_getenv("INDICATOR_GREETER_MODE"); greeter_mode = g_strcmp0(greeter_var, "1") == 0; + // devices + self->devices.name_hint = PACKAGE"-devices"; self->devices.menu = GTK_MENU (dbusmenu_gtkmenu_new(INDICATOR_SESSION_DBUS_NAME, INDICATOR_SESSION_DBUS_OBJECT)); if (greeter_mode){ -- cgit v1.2.3 From 5a3df0dde62593659e792f92236a8142087080f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Wed, 23 Nov 2011 22:58:41 +0100 Subject: Make GTK Logout Helper optional --- configure.ac | 41 ++++++++++++++++++++++++++++++++--------- data/Makefile.am | 20 ++++++++++++-------- src/Makefile.am | 8 +++++++- src/device-menu-mgr.c | 9 +++++++++ 4 files changed, 60 insertions(+), 18 deletions(-) diff --git a/configure.ac b/configure.ac index 0e20a91..a6ea42f 100644 --- a/configure.ac +++ b/configure.ac @@ -77,16 +77,38 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) -AS_IF([test "x$with_gtk" = x3], - [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK3_REQUIRED_VERSION - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - ], - [test "x$with_gtk" = x2], - [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION - polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION) - ] -) +########################### +# GTK Logout Helper +########################### +AC_ARG_ENABLE([gtklogouthelper], + AS_HELP_STRING([--enable-gtklogouthelper], [enable GTK Logout Helper]),, + enable_gtklogouthelper=auto) + +if test x"$enable_gtklogouthelper" != x"no" ; then + AS_IF([test "x$with_gtk" = x3], + [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-3.0 >= $GTK3_REQUIRED_VERSION + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION, + [have_gtklogouthelper=yes], + [have_gtklogouthelper=no]) + ], + [test "x$with_gtk" = x2], + [PKG_CHECK_MODULES(GTKLOGOUTHELPER, gtk+-2.0 >= $GTK_REQUIRED_VERSION + polkit-gobject-1 >= $POLKIT_REQUIRED_VERSION, + [have_gtklogouthelper=yes], + [have_gtklogouthelper=no]) + ] + ) + if test x${have_gtklogouthelper} = xyes; then + AC_DEFINE(HAVE_GTKLOGOUTHELPER, 1, [Define to 1 to enable GTK Logout Helper]) + fi + if test x${enable_gtklogouthelper} = xyes && test x${have_gtklogouthelper} = xno; then + AC_MSG_ERROR([GTK Logout Helper configured but polkit-gobject not found]) + fi +else + have_gtklogouthelper=no +fi +AM_CONDITIONAL(BUILD_GTKLOGOUTHELPER, test x${have_gtklogouthelper} = xyes) AC_SUBST(GTKLOGOUTHELPER_CFLAGS) AC_SUBST(GTKLOGOUTHELPER_LIBS) @@ -192,4 +214,5 @@ SUS Indicator Configuration: Prefix: $prefix Indicator Dir: $INDICATORDIR Indicator GTK: $with_gtk + Logout Helper: $have_gtklogouthelper ]) diff --git a/data/Makefile.am b/data/Makefile.am index 7e851a7..3b8de1f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,6 +18,15 @@ gsettings_SCHEMAS = com.canonical.indicator.session.gschema.xml convertdir = $(datadir)/GConf/gsettings dist_convert_DATA = indicator-session.convert +EXTRA_DIST = \ + $(service_in_files) \ + $(gsettings_SCHEMAS:.xml=.xml.in) + +CLEANFILES = \ + $(dbus_services_DATA) \ + $(gsettings_SCHEMAS) + +if BUILD_GTKLOGOUTHELPER @INTLTOOL_DESKTOP_RULE@ %.desktop.in: %.desktop.in.in @@ -37,14 +46,9 @@ logout_helper_desktop_files = \ $(logout_helper_desktop_in_in_files:.desktop.in.in=.desktop) logout_helper_DATA = $(logout_helper_desktop_files) -EXTRA_DIST = \ - $(service_in_files) \ - $(gsettings_SCHEMAS:.xml=.xml.in) \ +EXTRA_DIST += \ $(logout_helper_desktop_in_in_files) - -CLEANFILES = \ - $(dbus_services_DATA) \ - $(gsettings_SCHEMAS) \ +CLEANFILES += \ $(logout_helper_desktop_files) - +endif diff --git a/src/Makefile.am b/src/Makefile.am index dba0a9e..5209869 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,7 +1,11 @@ libexec_PROGRAMS = \ - indicator-session-service \ + indicator-session-service + +if BUILD_GTKLOGOUTHELPER +libexec_PROGRAMS += \ gtk-logout-helper +endif ################### # Indicator Stuff @@ -124,6 +128,7 @@ indicator_session_service_LDADD = \ # GTK Logout Stuff ################# +if BUILD_GTKLOGOUTHELPER gtk_logout_helper_SOURCES = \ gtk-logout-helper.c \ settings-helper.c \ @@ -142,6 +147,7 @@ gtk_logout_helper_LDADD = \ $(SESSIONSERVICE_LIBS) \ $(GTKLOGOUTHELPER_LIBS) \ $(GCONF_LIBS) +endif ############### diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 5a63be3..926090f 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#include #include #include @@ -410,7 +411,11 @@ static void show_dialog (DbusmenuMenuitem * mi, guint timestamp, gchar * type) { +#ifdef HAVE_GTKLOGOUTHELPER gchar * helper = g_build_filename(LIBEXECDIR, "gtk-logout-helper", NULL); +#else + gchar * helper = g_build_filename("gnome-session-quit", NULL); +#endif /* HAVE_GTKLOGOUTHELPER */ gchar * dialog_line = g_strdup_printf("%s --%s", helper, type); g_free(helper); @@ -726,7 +731,11 @@ device_menu_mgr_build_static_items (DeviceMenuMgr* self, gboolean greeter_mode) dbusmenu_menuitem_child_append (self->root_item, shutdown_mi); g_signal_connect (G_OBJECT(shutdown_mi), DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, +#ifdef HAVE_GTKLOGOUTHELPER G_CALLBACK(show_dialog), "shutdown"); +#else + G_CALLBACK(show_dialog), "power-off"); +#endif /* HAVE_GTKLOGOUTHELPER */ RestartShutdownLogoutMenuItems * restart_shutdown_logout_mi = g_new0 (RestartShutdownLogoutMenuItems, 1); restart_shutdown_logout_mi->logout_mi = logout_mi; -- cgit v1.2.3 From b3d54d8b5d90cdaaa7169a25e9c9a8823d6ef61c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gy=C3=B6rgy=20Ball=C3=B3?= Date: Wed, 23 Nov 2011 22:59:19 +0100 Subject: Make APT support optional --- configure.ac | 13 +++++++++++++ src/Makefile.am | 13 +++++++++---- src/device-menu-mgr.c | 18 ++++++++++++++++++ 3 files changed, 40 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index a6ea42f..d47d754 100644 --- a/configure.ac +++ b/configure.ac @@ -113,6 +113,18 @@ AM_CONDITIONAL(BUILD_GTKLOGOUTHELPER, test x${have_gtklogouthelper} = xyes) AC_SUBST(GTKLOGOUTHELPER_CFLAGS) AC_SUBST(GTKLOGOUTHELPER_LIBS) +########################### +# APT support +########################### +AC_ARG_ENABLE([apt], + AC_HELP_STRING([--disable-apt], [disable APT support]),, + [enable_apt=yes]) +AM_CONDITIONAL([BUILD_APT], [test "x$enable_apt" != "xno"]) + +if test "x$enable_apt" != "xno"; then + AC_DEFINE(HAVE_APT, 1, [Define to 1 to enable APT support]) +fi + ########################### # Check to see if we're local ########################### @@ -215,4 +227,5 @@ SUS Indicator Configuration: Indicator Dir: $INDICATORDIR Indicator GTK: $with_gtk Logout Helper: $have_gtklogouthelper + APT support: $enable_apt ]) diff --git a/src/Makefile.am b/src/Makefile.am index 5209869..afee66c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -107,13 +107,18 @@ indicator_session_service_SOURCES = \ user-menu-mgr.c \ device-menu-mgr.h \ device-menu-mgr.c \ - apt-watcher.h \ - apt-watcher.c \ - apt-transaction.h \ - apt-transaction.c \ udev-mgr.h \ udev-mgr.c \ sane-rules.h + +if BUILD_APT +indicator_session_service_SOURCES += \ + apt-watcher.h \ + apt-watcher.c \ + apt-transaction.h \ + apt-transaction.c +endif + indicator_session_service_CFLAGS = \ $(SESSIONSERVICE_CFLAGS) \ $(GCONF_CFLAGS) \ diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 926090f..3858564 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -27,7 +27,11 @@ with this program. If not, see . #include "dbusmenu-shared.h" #include "lock-helper.h" #include "upower-client.h" + +#ifdef HAVE_APT #include "apt-watcher.h" +#endif /* HAVE_APT */ + #include "udev-mgr.h" #define UP_ADDRESS "org.freedesktop.UPower" @@ -41,7 +45,9 @@ struct _DeviceMenuMgr GObject parent_instance; DbusmenuMenuitem* root_item; SessionDbus* session_dbus_interface; +#ifdef HAVE_APT AptWatcher* apt_watcher; +#endif /* HAVE_APT */ UdevMgr* udev_mgr; }; @@ -51,7 +57,9 @@ static DbusmenuMenuitem *lock_menuitem = NULL; static DbusmenuMenuitem *system_settings_menuitem = NULL; static DbusmenuMenuitem *display_settings_menuitem = NULL; static DbusmenuMenuitem *login_settings_menuitem = NULL; +#ifdef HAVE_APT static DbusmenuMenuitem *software_updates_menuitem = NULL; +#endif /* HAVE_APT */ static DbusmenuMenuitem *printers_menuitem = NULL; static DbusmenuMenuitem *scanners_menuitem = NULL; static DbusmenuMenuitem *webcam_menuitem = NULL; @@ -103,7 +111,9 @@ G_DEFINE_TYPE (DeviceMenuMgr, device_menu_mgr, G_TYPE_OBJECT); static void device_menu_mgr_init (DeviceMenuMgr *self) { +#ifdef HAVE_APT self->apt_watcher = NULL; +#endif /* HAVE_APT */ self->root_item = dbusmenu_menuitem_new (); setup_up(self); g_idle_add(lock_screen_setup, NULL); @@ -485,12 +495,14 @@ static void device_menu_mgr_show_simple_scan (DbusmenuMenuitem * mi, { g_warning("Unable to launch simple-scan: %s", error->message); g_error_free(error); +#ifdef HAVE_APT if (!g_spawn_command_line_async("software-center simple-scan", &error)) { g_warning ("Unable to launch software-centre simple-scan: %s", error->message); g_error_free(error); } +#endif /* HAVE_APT */ } } @@ -503,12 +515,14 @@ static void device_menu_mgr_show_cheese (DbusmenuMenuitem * mi, { g_warning("Unable to launch cheese: %s", error->message); g_error_free(error); +#ifdef HAVE_APT if (!g_spawn_command_line_async("software-center cheese", &error)) { g_warning ("Unable to launch software-centre cheese: %s", error->message); g_error_free(error); } +#endif /* HAVE_APT */ } } @@ -547,6 +561,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) dbusmenu_menuitem_child_add_position(self->root_item, login_settings_menuitem, 2); +#ifdef HAVE_APT software_updates_menuitem = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (software_updates_menuitem, DBUSMENU_MENUITEM_PROP_LABEL, @@ -554,6 +569,7 @@ device_menu_mgr_build_settings_items (DeviceMenuMgr* self) dbusmenu_menuitem_child_add_position(self->root_item, software_updates_menuitem, 3); +#endif /* HAVE_APT */ DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (separator1, @@ -787,9 +803,11 @@ DeviceMenuMgr* device_menu_mgr_new (SessionDbus* session_dbus, gboolean greeter_ DeviceMenuMgr* device_mgr = g_object_new (DEVICE_TYPE_MENU_MGR, NULL); device_mgr->session_dbus_interface = session_dbus; device_menu_mgr_build_static_items (device_mgr, greeter_mode); +#ifdef HAVE_APT if (software_updates_menuitem != NULL) { device_mgr->apt_watcher = apt_watcher_new (session_dbus, software_updates_menuitem); } +#endif /* HAVE_APT */ return device_mgr; } -- cgit v1.2.3 From 38923e553288e7d69d7c524bd1a7010cc83e77db Mon Sep 17 00:00:00 2001 From: Marc Deslauriers Date: Mon, 30 Jan 2012 09:39:29 -0500 Subject: Remove dead GSS throttling code. Let gnome-settings-daemon handle locking the screen when UPower requests it. --- src/device-menu-mgr.c | 26 +--------------- src/lock-helper.c | 86 --------------------------------------------------- src/lock-helper.h | 3 -- 3 files changed, 1 insertion(+), 114 deletions(-) diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 3858564..d3734a2 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -83,7 +83,6 @@ static DBusGProxy * up_prop_proxy = NULL; static void device_menu_mgr_ensure_settings_client (DeviceMenuMgr* self); static void setup_up (DeviceMenuMgr* self); static void device_menu_mgr_rebuild_items (DeviceMenuMgr *self); -static void lock_if_possible (DeviceMenuMgr* self); static void machine_sleep_with_context (DeviceMenuMgr* self, gchar* type); static void show_system_settings_with_context (DbusmenuMenuitem * mi, @@ -173,27 +172,6 @@ keybinding_changed (GSettings *settings, return; } -/* Check to see if the lockdown key is protecting from - locking the screen. If not, lock it. */ -static void -lock_if_possible (DeviceMenuMgr* self) { - device_menu_mgr_ensure_settings_client (self); - - if (!g_settings_get_boolean (lockdown_settings, LOCKDOWN_KEY_SCREENSAVER)) { - lock_screen (NULL, 0, NULL); - } - return; -} - -/* A return from the command to sleep the system. Make sure - that we unthrottle the screensaver. */ -static void -sleep_response (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data) -{ - screensaver_unthrottle(); - return; -} - static void machine_sleep_from_suspend (DbusmenuMenuitem * mi, guint timestamp, @@ -221,11 +199,9 @@ machine_sleep_with_context (DeviceMenuMgr* self, gchar* type) g_warning("Can not %s as no upower proxy", type); } - screensaver_throttle(type); - lock_if_possible (self); dbus_g_proxy_begin_call(up_main_proxy, type, - sleep_response, + NULL, NULL, NULL, G_TYPE_INVALID); diff --git a/src/lock-helper.c b/src/lock-helper.c index 4c91aa5..8eae674 100644 --- a/src/lock-helper.c +++ b/src/lock-helper.c @@ -29,8 +29,6 @@ with this program. If not, see . static DBusGProxy * gss_proxy = NULL; static GMainLoop * gss_mainloop = NULL; -static guint cookie = 0; -static DBusGProxyCall * cookie_call = NULL; static gboolean is_guest = FALSE; @@ -38,90 +36,6 @@ static GSettings * settings = NULL; void build_gss_proxy (void); -/* Checks to see if there is an error and reports - it. Not much else we can do. */ -static void -unthrottle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data) -{ - GError * error = NULL; - dbus_g_proxy_end_call(proxy, call, &error, - G_TYPE_INVALID); - - if (error != NULL) { - g_warning("Unable to unthrottle: %s", error->message); - } - return; -} - -/* Sends an unthrottle if we're throttled. */ -void -screensaver_unthrottle (void) -{ - g_return_if_fail(cookie != 0); - - build_gss_proxy(); - g_return_if_fail(gss_proxy != NULL); - - dbus_g_proxy_begin_call(gss_proxy, "UnThrottle", - unthrottle_return, NULL, - NULL, - G_TYPE_UINT, cookie, - G_TYPE_INVALID); - - cookie = 0; - return; -} - -/* Gets there return cookie from the throttle command - and sets things valid */ -static void -throttle_return (DBusGProxy * proxy, DBusGProxyCall * call, gpointer data) -{ - GError * error = NULL; - cookie_call = NULL; - - dbus_g_proxy_end_call(proxy, call, &error, - G_TYPE_UINT, &cookie, - G_TYPE_INVALID); - - if (error != NULL) { - g_warning("Unable to throttle the screensaver: %s", error->message); - return; - } - - - if (cookie == 0) { - g_warning("We didn't get a throttle cookie!"); - } - - return; -} - -/* Throttling the screensaver by using the screen saver - command. */ -void -screensaver_throttle (gchar * reason) -{ - g_return_if_fail(cookie_call == NULL); - g_return_if_fail(will_lock_screen()); - - if (cookie != 0) { - screensaver_unthrottle(); - } - - build_gss_proxy(); - g_return_if_fail(gss_proxy != NULL); - - cookie_call = dbus_g_proxy_begin_call(gss_proxy, "Throttle", - throttle_return, NULL, - NULL, - G_TYPE_STRING, "Session Menu", - G_TYPE_STRING, reason, - G_TYPE_INVALID); - - return; -} - /* This is our logic on whether the screen should be locked or not. It effects everything else. */ gboolean diff --git a/src/lock-helper.h b/src/lock-helper.h index 37f1448..e2d5106 100644 --- a/src/lock-helper.h +++ b/src/lock-helper.h @@ -24,9 +24,6 @@ with this program. If not, see . #include -void screensaver_throttle (gchar * reason); -void screensaver_unthrottle (void); - gboolean will_lock_screen (void); void lock_screen (DbusmenuMenuitem * mi, guint timestamp, gpointer data); gboolean lock_screen_setup (gpointer data); -- cgit v1.2.3 From c2ade265fc4a138a3d2d9f4081188ad5c380ca37 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 31 Jan 2012 21:18:20 -0600 Subject: Updating required dbusmenu 0.5.90 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index d47d754..3e5fa97 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) GTK_REQUIRED_VERSION=2.12 GTK3_REQUIRED_VERSION=3.0 INDICATOR_REQUIRED_VERSION=0.3.19 -DBUSMENUGTK_REQUIRED_VERSION=0.4.92 +DBUSMENUGTK_REQUIRED_VERSION=0.5.90 POLKIT_REQUIRED_VERSION=0.92 AC_ARG_WITH([gtk], -- cgit v1.2.3 From ab073d8e5adf1b6771f5d9e5f4b8aaf20800b604 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 31 Jan 2012 21:21:26 -0600 Subject: Modifying includes to not include libdbusmenu-gtk3 stuff --- src/apt-watcher.h | 4 ---- src/device-menu-mgr.c | 1 - src/indicator-session.c | 4 ---- src/session-service.c | 4 ---- src/udev-mgr.h | 4 ---- src/user-menu-mgr.h | 2 +- src/user-widget.h | 4 ---- 7 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/apt-watcher.h b/src/apt-watcher.h index 7b98a44..6b7d5e1 100644 --- a/src/apt-watcher.h +++ b/src/apt-watcher.h @@ -25,11 +25,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif #include "session-dbus.h" diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index 3858564..6ce5962 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -19,7 +19,6 @@ with this program. If not, see . #include #include -#include #include "device-menu-mgr.h" #include "settings-helper.h" diff --git a/src/indicator-session.c b/src/indicator-session.c index ec49f0e..bd7bcd3 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -31,11 +31,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif #include #include diff --git a/src/session-service.c b/src/session-service.c index 753e304..6ee18e9 100644 --- a/src/session-service.c +++ b/src/session-service.c @@ -39,11 +39,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif #include diff --git a/src/udev-mgr.h b/src/udev-mgr.h index 5119803..2e57cff 100644 --- a/src/udev-mgr.h +++ b/src/udev-mgr.h @@ -24,11 +24,7 @@ with this program. If not, see . #include #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif G_BEGIN_DECLS diff --git a/src/user-menu-mgr.h b/src/user-menu-mgr.h index 01823e7..40f7b18 100644 --- a/src/user-menu-mgr.h +++ b/src/user-menu-mgr.h @@ -23,7 +23,7 @@ with this program. If not, see . #include -#include +#include #include "session-dbus.h" diff --git a/src/user-widget.h b/src/user-widget.h index e1f6d1a..52a5e34 100644 --- a/src/user-widget.h +++ b/src/user-widget.h @@ -20,11 +20,7 @@ with this program. If not, see . #define __USER_WIDGET_H__ #include -#if GTK_CHECK_VERSION(3, 0, 0) -#include -#else #include -#endif G_BEGIN_DECLS -- cgit v1.2.3 From 2612c2465cc2e735a4194d1f63f5028031a35224 Mon Sep 17 00:00:00 2001 From: Alberto Mardegan Date: Thu, 2 Feb 2012 15:38:35 +0200 Subject: Remove "Online accounts" from user menu The "Online accounts" feature is going to be removed from the control panel in Precise. --- src/user-menu-mgr.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/src/user-menu-mgr.c b/src/user-menu-mgr.c index 54e718f..3f4bdc4 100644 --- a/src/user-menu-mgr.c +++ b/src/user-menu-mgr.c @@ -48,9 +48,6 @@ static void activate_user_accounts (DbusmenuMenuitem *mi, gpointer user_data); static gint compare_users_by_username (const gchar *a, const gchar *b); -static void activate_online_accounts (DbusmenuMenuitem *mi, - guint timestamp, - gpointer user_data); static void activate_user_accounts (DbusmenuMenuitem *mi, guint timestamp, gpointer user_data); @@ -255,26 +252,12 @@ user_menu_mgr_rebuild_items (UserMenuMgr *self, gboolean greeter_mode) } g_list_free(users); } - // Add the online accounts and separator + // Add the user accounts and separator DbusmenuMenuitem * separator1 = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (separator1, DBUSMENU_MENUITEM_PROP_TYPE, DBUSMENU_CLIENT_TYPES_SEPARATOR); dbusmenu_menuitem_child_append (self->root_item, separator1); - DbusmenuMenuitem * online_accounts_item = dbusmenu_menuitem_new(); - dbusmenu_menuitem_property_set (online_accounts_item, - DBUSMENU_MENUITEM_PROP_TYPE, - DBUSMENU_CLIENT_TYPES_DEFAULT); - dbusmenu_menuitem_property_set (online_accounts_item, - DBUSMENU_MENUITEM_PROP_LABEL, - _("Online Accounts…")); - - g_signal_connect (G_OBJECT (online_accounts_item), - DBUSMENU_MENUITEM_SIGNAL_ITEM_ACTIVATED, - G_CALLBACK (activate_online_accounts), - NULL); - - dbusmenu_menuitem_child_append (self->root_item, online_accounts_item); DbusmenuMenuitem * user_accounts_item = dbusmenu_menuitem_new(); dbusmenu_menuitem_property_set (user_accounts_item, @@ -359,22 +342,6 @@ compare_users_by_username (const gchar *a, return retval; } -// TODO -// Wait until dialog is complete to find out name to pass -// to the control centre. -static void -activate_online_accounts (DbusmenuMenuitem *mi, - guint timestamp, - gpointer user_data) -{ - GError * error = NULL; - if (!g_spawn_command_line_async("gnome-control-center online-accounts", &error)) - { - g_warning("Unable to show control centre: %s", error->message); - g_error_free(error); - } -} - static void activate_user_accounts (DbusmenuMenuitem *mi, guint timestamp, -- cgit v1.2.3 From e9987ce4005173f81f177b3151208e5f749e7f7c Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Feb 2012 11:11:34 -0600 Subject: Adding flags into the build to make sure we know if we're GTK3 or not --- configure.ac | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/configure.ac b/configure.ac index 3e5fa97..a34450c 100644 --- a/configure.ac +++ b/configure.ac @@ -51,6 +51,7 @@ AS_IF([test "x$with_gtk" = x3], ], [AC_MSG_FAILURE([Value for --with-indicator-gtk was neither 2 nor 3])] ) + AC_SUBST(APPLET_CFLAGS) AC_SUBST(APPLET_LIBS) @@ -77,6 +78,11 @@ AS_IF([test "x$with_gtk" = x3], AC_SUBST(SESSIONERVICE_CFLAGS) AC_SUBST(SESSIONERVICE_LIBS) +AM_CONDITIONAL([USE_GTK3], [test "x$with_gtk" = "x3"]) +AS_IF([test "x$with_gtk" = x3], [ + AC_DEFINE(HAVE_GTK3, 1, [whether gtk3 is available]) + ]) + ########################### # GTK Logout Helper ########################### -- cgit v1.2.3 From 0d10a8e683b76a3bdb245c0f068027a757be12d4 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Feb 2012 11:11:52 -0600 Subject: If we have GTK3 use the new gtk_box_new() function not the deprecated one --- src/user-widget.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/user-widget.c b/src/user-widget.c index 937a9eb..88ac11c 100644 --- a/src/user-widget.c +++ b/src/user-widget.c @@ -136,7 +136,11 @@ user_widget_init (UserWidget *self) gtk_misc_set_padding (GTK_MISC(priv->user_image),0, 4.0); priv->user_name = gtk_label_new (""); +#if HAVE_GTK3 + priv->container = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0); +#else priv->container = gtk_hbox_new (FALSE, 0); +#endif priv->tick_icon = gtk_image_new_from_icon_name ("account-logged-in", GTK_ICON_SIZE_MENU); gtk_misc_set_alignment(GTK_MISC(priv->tick_icon), 1.0, 0.5); -- cgit v1.2.3 From 6975e8a7aab320c77f3cb3de345415b9f26ba5cd Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 7 Feb 2012 16:46:27 -0600 Subject: 0.3.90 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a34450c..1a53757 100644 --- a/configure.ac +++ b/configure.ac @@ -4,7 +4,7 @@ AC_INIT(src/indicator-session.c) AC_PREREQ(2.53) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(indicator-session, 0.3.7.1) +AM_INIT_AUTOMAKE(indicator-session, 0.3.90) AM_MAINTAINER_MODE -- cgit v1.2.3