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 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 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