aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/apt-watcher.c95
-rw-r--r--src/indicator-session.c3
2 files changed, 65 insertions, 33 deletions
diff --git a/src/apt-watcher.c b/src/apt-watcher.c
index 167b847..b0d9688 100644
--- a/src/apt-watcher.c
+++ b/src/apt-watcher.c
@@ -66,6 +66,13 @@ static void apt_watcher_signal_cb (GDBusProxy* proxy,
static void apt_watcher_manage_transactions (AptWatcher* self,
gchar* transaction_id);
static gboolean apt_watcher_query_reboot_status (gpointer self);
+static void apt_watcher_transaction_state_simulation_update_cb (AptTransaction* trans,
+ gint update,
+ gpointer user_data);
+static void apt_watcher_transaction_state_real_update_cb (AptTransaction* trans,
+ gint update,
+ gpointer user_data);
+
@@ -245,34 +252,23 @@ apt_watcher_show_apt_dialog (DbusmenuMenuitem * mi,
}
static void
-apt_watcher_transaction_state_update_cb (AptTransaction* trans,
- gint update,
- gpointer user_data)
+apt_watcher_transaction_state_real_update_cb (AptTransaction* trans,
+ gint update,
+ gpointer user_data)
{
g_debug ("apt-watcher -transaction update %i", update);
g_return_if_fail (APT_IS_WATCHER (user_data));
AptWatcher* self = APT_WATCHER (user_data);
AptState state = (AptState)update;
-
if (state == UP_TO_DATE){
dbusmenu_menuitem_property_set (self->apt_item,
DBUSMENU_MENUITEM_PROP_LABEL,
_("Software Up to Date"));
- // Simulations don't send a finished signal for some reason
- // Anyway from a simulation we just need one state update
- // (updates available or not)
- if (apt_transaction_get_transaction_type (self->current_transaction)
- == SIMULATION){
- g_object_unref (G_OBJECT(self->current_transaction));
- self->current_transaction = NULL;
- }
if (self->reboot_query != 0){
g_source_remove (self->reboot_query);
self->reboot_query = 0;
}
- // Wait a sec before querying for reboot status,
- // race condition with Apt has been observed.
self->reboot_query = g_timeout_add_seconds (1,
apt_watcher_query_reboot_status,
self);
@@ -281,27 +277,15 @@ apt_watcher_transaction_state_update_cb (AptTransaction* trans,
dbusmenu_menuitem_property_set (self->apt_item,
DBUSMENU_MENUITEM_PROP_LABEL,
_("Updates Available…"));
- // Simulations don't send a finished signal for some reason
- // Anyway from a simulation we just need one state update
- // (updates available or not)
- if (apt_transaction_get_transaction_type (self->current_transaction)
- == SIMULATION){
- g_object_unref (G_OBJECT(self->current_transaction));
- self->current_transaction = NULL;
- }
+ self->current_state = state;
}
else if (state == UPGRADE_IN_PROGRESS){
dbusmenu_menuitem_property_set (self->apt_item,
DBUSMENU_MENUITEM_PROP_LABEL,
_("Updates Installing…"));
+ self->current_state = state;
}
else if (state == FINISHED){
- g_object_unref (G_OBJECT(self->current_transaction));
- self->current_transaction = NULL;
-
- if (self->current_state == UPDATES_AVAILABLE){
- return;
- }
if (self->reboot_query != 0){
g_source_remove (self->reboot_query);
@@ -312,11 +296,57 @@ apt_watcher_transaction_state_update_cb (AptTransaction* trans,
self->reboot_query = g_timeout_add_seconds (1,
apt_watcher_query_reboot_status,
self);
+ }
+
+ self->current_state = state;
+
+ if (self->current_state != UPGRADE_IN_PROGRESS){
+ g_object_unref (G_OBJECT(self->current_transaction));
+ self->current_transaction = NULL;
+ }
+}
+
+
+static void
+apt_watcher_transaction_state_simulation_update_cb (AptTransaction* trans,
+ gint update,
+ gpointer user_data)
+{
+ g_debug ("apt-watcher -transaction update %i", update);
+ g_return_if_fail (APT_IS_WATCHER (user_data));
+ AptWatcher* self = APT_WATCHER (user_data);
+
+ AptState state = (AptState)update;
+
+ if (state == UP_TO_DATE){
+ dbusmenu_menuitem_property_set (self->apt_item,
+ DBUSMENU_MENUITEM_PROP_LABEL,
+ _("Software Up to Date"));
+ 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);
+ }
+ else if (state == UPDATES_AVAILABLE){
dbusmenu_menuitem_property_set (self->apt_item,
DBUSMENU_MENUITEM_PROP_LABEL,
- _("Finished Updating…"));
+ _("Updates Available…"));
}
+ else if (state == UPGRADE_IN_PROGRESS){
+ dbusmenu_menuitem_property_set (self->apt_item,
+ DBUSMENU_MENUITEM_PROP_LABEL,
+ _("Updates Installing…"));
+ }
+
self->current_state = state;
+
+ if (self->current_state != UPGRADE_IN_PROGRESS){
+ g_object_unref (G_OBJECT(self->current_transaction));
+ self->current_transaction = NULL;
+ }
}
static void
@@ -326,7 +356,7 @@ apt_watcher_manage_transactions (AptWatcher* self, gchar* transaction_id)
self->current_transaction = apt_transaction_new (transaction_id, SIMULATION);
g_signal_connect (G_OBJECT(self->current_transaction),
"state-update",
- G_CALLBACK(apt_watcher_transaction_state_update_cb), self);
+ G_CALLBACK(apt_watcher_transaction_state_simulation_update_cb), self);
}
}
@@ -359,6 +389,7 @@ apt_watcher_query_reboot_status (gpointer data)
DBUSMENU_MENUITEM_PROP_DISPOSITION,
DBUSMENU_MENUITEM_DISPOSITION_ALERT);
session_dbus_restart_required (self->session_dbus_interface);
+ self->current_state = RESTART_NEEDED;
}
self->reboot_query = 0;
return FALSE;
@@ -384,7 +415,7 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
if (g_str_has_prefix (current, "/org/debian/apt/transaction/") == TRUE){
g_debug ("ActiveTransactionsChanged - current is %s", current);
-
+
// Cancel all existing operations.
if (self->reboot_query != 0){
g_source_remove (self->reboot_query);
@@ -400,7 +431,7 @@ static void apt_watcher_signal_cb ( GDBusProxy* proxy,
self->current_transaction = apt_transaction_new (current, REAL);
g_signal_connect (G_OBJECT(self->current_transaction),
"state-update",
- G_CALLBACK(apt_watcher_transaction_state_update_cb), self);
+ G_CALLBACK(apt_watcher_transaction_state_real_update_cb), self);
}
}
g_variant_unref (parameters);
diff --git a/src/indicator-session.c b/src/indicator-session.c
index 2f1764f..f41c841 100644
--- a/src/indicator-session.c
+++ b/src/indicator-session.c
@@ -507,11 +507,12 @@ receive_signal (GDBusProxy * proxy,
&self->users);
}
}
- else if (g_strcmp0(signal_name, "RestartRequired") == 0) {
+ else if (g_strcmp0(signal_name, "RestartRequired") == 0) {
if (greeter_mode == TRUE){
self->devices.image = indicator_image_helper (GREETER_ICON_RESTART);
}
else{
+ g_debug ("reboot required");
self->devices.image = indicator_image_helper (ICON_RESTART);
}
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 11:17:35 +0000