diff options
| author | Allan LeSage <allanlesage@gmail.com> | 2012-03-28 17:29:05 -0500 |
|---|---|---|
| committer | Allan LeSage <allanlesage@gmail.com> | 2012-03-28 17:29:05 -0500 |
| commit | affff0009831fc4765ba023ce044ca4d79ac0842 (patch) | |
| tree | 42ae46b52973669c40016b1df7aa69c37a4bd4f3 /src/apt-watcher.c | |
| parent | d9416f4f284c401b8848e4bd249fd5cbd25142c3 (diff) | |
| parent | 80f29374f243cd53e53bf662a0017cd4088d238a (diff) | |
| download | ayatana-indicator-session-affff0009831fc4765ba023ce044ca4d79ac0842.tar.gz ayatana-indicator-session-affff0009831fc4765ba023ce044ca4d79ac0842.tar.bz2 ayatana-indicator-session-affff0009831fc4765ba023ce044ca4d79ac0842.zip | |
Merged from trunk.
Diffstat (limited to 'src/apt-watcher.c')
| -rw-r--r-- | src/apt-watcher.c | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/src/apt-watcher.c b/src/apt-watcher.c index c638a93..092942f 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); @@ -115,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 |