From 6f222333dd2c85a8023ed0e4b05c6ff7f74f3731 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Mar 2012 14:26:42 +0100 Subject: src/apt-watcher.c: check the pk_results_get_require_restart_worst() in get_updates() too --- src/apt-watcher.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/src/apt-watcher.c b/src/apt-watcher.c index c638a93..73ebdb9 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -52,6 +52,7 @@ get_updates_complete (GObject *source_object, AptWatcher* self = APT_WATCHER (user_data); PkResults *results; + PkRestartEnum restart_required; GError *error = NULL; results = pk_client_generic_finish (PK_CLIENT(source_object), res, &error); @@ -83,6 +84,20 @@ get_updates_complete (GObject *source_object, DBUSMENU_MENUITEM_PROP_LABEL, _("Software Up to Date")); } + + /* check if there was a restart required info in the signal */ + restart_required = pk_results_get_require_restart_worst (results); + if (restart_required == PK_RESTART_ENUM_SYSTEM || + restart_required == PK_RESTART_ENUM_SECURITY_SYSTEM) { + dbusmenu_menuitem_property_set (self->apt_item, + DBUSMENU_MENUITEM_PROP_LABEL, + _("Restart to Complete Updates…")); + dbusmenu_menuitem_property_set (self->apt_item, + DBUSMENU_MENUITEM_PROP_DISPOSITION, + DBUSMENU_MENUITEM_DISPOSITION_ALERT); + session_dbus_restart_required (self->session_dbus_interface); + } + g_ptr_array_unref (packages); g_object_unref (results); g_object_unref (source_object); -- cgit v1.2.3 From 9e862f15a1f4a86a0a5215c27d6d71905efebfd5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Mar 2012 14:28:01 +0100 Subject: src/apt-watcher.c: remove no longer needed code, this RestartRequired is a bit misleading as it about that the PK daemon got restarted not about system or session --- src/apt-watcher.c | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/apt-watcher.c b/src/apt-watcher.c index 73ebdb9..092942f 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -130,16 +130,6 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, g_debug ("updates changed signal received"); apt_watcher_check_for_updates (self); } - else if (g_strcmp0(signal_name, "RestartSchedule") == 0) { - g_debug ("RestartScheduled signal received"); - dbusmenu_menuitem_property_set (self->apt_item, - DBUSMENU_MENUITEM_PROP_LABEL, - _("Restart to Complete Updates…")); - dbusmenu_menuitem_property_set (self->apt_item, - DBUSMENU_MENUITEM_PROP_DISPOSITION, - DBUSMENU_MENUITEM_DISPOSITION_ALERT); - session_dbus_restart_required (self->session_dbus_interface); - } } static void -- cgit v1.2.3 From 0034324b42274ffa51e280098eee33b85215ac3d Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Fri, 9 Mar 2012 15:22:31 -0600 Subject: 0.3.93 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ab12f12..a80f6c7 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.92) +AM_INIT_AUTOMAKE(indicator-session, 0.3.93) AM_MAINTAINER_MODE -- cgit v1.2.3 From bc34f047520493d166e785a5fca971f7a4a830a9 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 14 Mar 2012 10:33:28 -0500 Subject: 0.3.94 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index a80f6c7..0daf69b 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.93) +AM_INIT_AUTOMAKE(indicator-session, 0.3.94) AM_MAINTAINER_MODE -- cgit v1.2.3 From f6a6e8cfee89492f4f94f9382d02831b140fffbc Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 16 Mar 2012 14:12:16 -0500 Subject: plug two leaked strings in keybinding_changed() --- src/device-menu-mgr.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/device-menu-mgr.c b/src/device-menu-mgr.c index cfdb55d..d081937 100644 --- a/src/device-menu-mgr.c +++ b/src/device-menu-mgr.c @@ -166,11 +166,12 @@ keybinding_changed (GSettings *settings, } if (g_strcmp0 (key, KEY_LOCK_SCREEN) == 0) { - g_debug("Keybinding changed to: %s", g_settings_get_string(settings, key)); + gchar * val = g_settings_get_string(settings, key); + g_debug("Keybinding changed to: %s", val); if (lock_menuitem != NULL) { - dbusmenu_menuitem_property_set_shortcut_string (lock_menuitem, - g_settings_get_string(settings, key)); + dbusmenu_menuitem_property_set_shortcut_string (lock_menuitem, val); } + g_free (val); } return; } -- cgit v1.2.3 From d2c9e397565f3be00a564107b6466d01250c0dbe Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 16 Mar 2012 18:09:23 -0500 Subject: to pull a const string from g_variant_get(), use a format string "&s", not "s" --- 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 5d894e8..0051af1 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -428,7 +428,7 @@ user_real_name_get_cb (GObject * obj, GAsyncResult * res, gpointer user_data) } const gchar* username = NULL; - g_variant_get (result, "(s)", &username); + g_variant_get (result, "(&s)", &username); indicator_session_update_users_label (self, username); return; } @@ -481,7 +481,7 @@ receive_signal (GDBusProxy * proxy, if (g_strcmp0(signal_name, "UserRealNameUpdated") == 0) { const gchar* username = NULL; - g_variant_get (parameters, "(s)", &username); + g_variant_get (parameters, "(&s)", &username); indicator_session_update_users_label (self, username); } else if (g_strcmp0(signal_name, "UserMenuIsVisible") == 0) { -- cgit v1.2.3 From 537804ecacb2732a6e86a4234f7173cd54f3b095 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 16 Mar 2012 18:12:56 -0500 Subject: plug two more memory leaks. g_variant_get("s") makes a newly-allocated duplicated string, g_variant_get("&s") returns the internal const string. --- 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 5d894e8..0051af1 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -428,7 +428,7 @@ user_real_name_get_cb (GObject * obj, GAsyncResult * res, gpointer user_data) } const gchar* username = NULL; - g_variant_get (result, "(s)", &username); + g_variant_get (result, "(&s)", &username); indicator_session_update_users_label (self, username); return; } @@ -481,7 +481,7 @@ receive_signal (GDBusProxy * proxy, if (g_strcmp0(signal_name, "UserRealNameUpdated") == 0) { const gchar* username = NULL; - g_variant_get (parameters, "(s)", &username); + g_variant_get (parameters, "(&s)", &username); indicator_session_update_users_label (self, username); } else if (g_strcmp0(signal_name, "UserMenuIsVisible") == 0) { -- cgit v1.2.3 From ddd26808cecb8050db7438ee59b3bab3f6ba4612 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 16 Mar 2012 19:24:04 -0500 Subject: fix memory leak updating the username label -- gtk_label_set_text() takes a const char*, we don't need to g_strdup() the string before passing it in --- src/indicator-session.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/src/indicator-session.c b/src/indicator-session.c index 0051af1..c6f4d9c 100644 --- a/src/indicator-session.c +++ b/src/indicator-session.c @@ -713,14 +713,8 @@ indicator_session_update_users_label (IndicatorSession* self, } GSettings* settings = g_settings_new ("com.canonical.indicator.session"); - gboolean use_name = g_settings_get_boolean (settings, - "show-real-name-on-panel"); + const gboolean use_name = g_settings_get_boolean (settings, "show-real-name-on-panel"); + gtk_label_set_text (self->users.label, name); + gtk_widget_set_visible (GTK_WIDGET(self->users.label), use_name); g_object_unref (settings); - gtk_label_set_text (self->users.label, g_strdup(name)); - if (use_name){ - gtk_widget_show(GTK_WIDGET(self->users.label)); - } - else{ - gtk_widget_hide(GTK_WIDGET(self->users.label)); - } } -- cgit v1.2.3 From 80f29374f243cd53e53bf662a0017cd4088d238a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Wed, 21 Mar 2012 11:58:29 -0500 Subject: 0.3.95 --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index 0daf69b..1230e8b 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.94) +AM_INIT_AUTOMAKE(indicator-session, 0.3.95) AM_MAINTAINER_MODE -- cgit v1.2.3