diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-27 14:51:51 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-27 14:51:51 -0500 |
| commit | 22c09b74f5fdc3958d38c9fcf2c91d67c14fa6c2 (patch) | |
| tree | dfe81f50de34e5e89e8459e094be61a558a021db /src/apt-watcher.c | |
| parent | 28b8bddfe57af6ee09d5be32fc413fb5c3e7121b (diff) | |
| parent | 99d0f953bfd72de8ad83c5e9a898897dcd17f268 (diff) | |
| download | ayatana-indicator-session-22c09b74f5fdc3958d38c9fcf2c91d67c14fa6c2.tar.gz ayatana-indicator-session-22c09b74f5fdc3958d38c9fcf2c91d67c14fa6c2.tar.bz2 ayatana-indicator-session-22c09b74f5fdc3958d38c9fcf2c91d67c14fa6c2.zip | |
Updating to trunk
Diffstat (limited to 'src/apt-watcher.c')
| -rw-r--r-- | src/apt-watcher.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/src/apt-watcher.c b/src/apt-watcher.c index 2c5ed0b..d8bb7e2 100644 --- a/src/apt-watcher.c +++ b/src/apt-watcher.c @@ -177,8 +177,6 @@ apt_watcher_on_name_appeared (GDBusConnection *connection, "the system bus", name_owner); - apt_watcher_query_reboot_status (user_data); - g_dbus_proxy_call (watcher->proxy, "UpgradeSystem", g_variant_new("(b)", TRUE), @@ -299,6 +297,15 @@ apt_watcher_transaction_state_real_update_cb (AptTransaction* trans, if (self->current_state != UPGRADE_IN_PROGRESS){ query_again = TRUE; } + else{ + if (self->reboot_query != 0){ + g_source_remove (self->reboot_query); + self->reboot_query = 0; + } + self->reboot_query = g_timeout_add_seconds (1, + apt_watcher_query_reboot_status, + self); + } self->current_state = state; g_object_unref (G_OBJECT(self->current_transaction)); @@ -383,7 +390,7 @@ apt_watcher_query_reboot_status (gpointer data) GVariant* reboot_result = g_dbus_proxy_get_cached_property (self->proxy, "RebootRequired"); - gboolean reboot; + gboolean reboot = FALSE; g_variant_get (reboot_result, "b", &reboot); g_debug ("apt_watcher_query_reboot_status: reboot prop = %i", reboot); if (reboot == FALSE){ @@ -398,7 +405,7 @@ apt_watcher_query_reboot_status (gpointer data) else{ dbusmenu_menuitem_property_set (self->apt_item, DBUSMENU_MENUITEM_PROP_LABEL, - _("Restart to complete updates…")); + _("Restart to Complete Updates…")); dbusmenu_menuitem_property_set (self->apt_item, DBUSMENU_MENUITEM_PROP_DISPOSITION, DBUSMENU_MENUITEM_DISPOSITION_ALERT); @@ -461,7 +468,7 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy, if (reboot_required){ dbusmenu_menuitem_property_set (self->apt_item, DBUSMENU_MENUITEM_PROP_LABEL, - _("Restart to complete updates…")); + _("Restart to Complete Updates…")); dbusmenu_menuitem_property_set (self->apt_item, DBUSMENU_MENUITEM_PROP_DISPOSITION, DBUSMENU_MENUITEM_DISPOSITION_ALERT); |