Author: ckornacker Date: Thu Feb 7 17:48:00 2008 New Revision: 8539 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8539&view=rev Log: update applet icon on settings change Modified: trunk/updater-gnome/src/updater-backend.c trunk/updater-gnome/src/updater-callbacks.c trunk/updater-gnome/src/updater-support.c trunk/updater-gnome/src/updater-support.h Modified: trunk/updater-gnome/src/updater-backend.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-backend.c?rev=8539&r1=8538&r2=8539&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-backend.c (original) +++ trunk/updater-gnome/src/updater-backend.c Thu Feb 7 17:48:00 2008 @@ -127,11 +127,6 @@ { SUSEUpdater *updater = updater_ptr; - gsize mandatory_count; - gsize optional_count; - - mandatory_count = 0; - optional_count = 0; g_print ("child process %d exited with status %d.\n",pid,status); @@ -149,68 +144,8 @@ // updater_ui_populate_update_list(updater); updater_ui_set_for_active_operation(updater, FALSE); - - /** - * update applet icon - */ - if (updater->settings_recommended_are_mandatory) - { - mandatory_count = mandatory_count + - updater->backend->security_updates_count + - updater->backend->security_restart_count + - updater->backend->recommended_updates_count + - updater->backend->recommended_restart_count; - - if (updater->settings_include_optional_patches) - { - optional_count = optional_count + updater->backend->optional_updates_count + - updater->backend->optional_restart_count; - } - - if (updater->settings_include_third_party_updates) - optional_count = optional_count + updater->backend->third_party_packages_count; - } - else - { - mandatory_count = mandatory_count + - updater->backend->security_updates_count + - updater->backend->security_restart_count; - - optional_count = optional_count + - updater->backend->recommended_updates_count + - updater->backend->recommended_restart_count; - - if (updater->settings_include_optional_patches) - { - optional_count = optional_count + updater->backend->optional_updates_count + - updater->backend->optional_restart_count; - } - - if (updater->settings_include_third_party_updates) - optional_count = optional_count + updater->backend->third_party_packages_count; - } - - if (mandatory_count > 0) - { - updater_applet_set_icon(updater->applet, ICON_RED); - updater_applet_set_tooltip(updater->applet, _("Mandatory updates available")); - } - else if (optional_count > 0) - { - updater_applet_set_icon(updater->applet, ICON_YELLOW); - updater_applet_set_tooltip(updater->applet, _("Additional updates available")); - } - else - { - updater_applet_set_icon(updater->applet, ICON_GREEN); - updater_applet_set_tooltip(updater->applet, _("Your system is up-to-date")); - } - - // update the ui elements with new data - - updater_ui_update(updater); + backend_update_applet_icon(updater); - } void backend_install_watch (GPid pid, Modified: trunk/updater-gnome/src/updater-callbacks.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-callbacks.c?rev=8539&r1=8538&r2=8539&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-callbacks.c (original) +++ trunk/updater-gnome/src/updater-callbacks.c Thu Feb 7 17:48:00 2008 @@ -272,6 +272,7 @@ updater->backend->include_optional_patches = updater->settings_include_optional_patches; g_printf("Optional?: %d\n", updater->settings_include_optional_patches); updater_save_settings(updater); + backend_update_applet_icon(updater); } void on_preferenceWindow_checkbutton_third_party_toggled (GtkWidget *widget, gpointer user_data) @@ -282,6 +283,7 @@ updater->backend->include_third_party_packages = updater->settings_include_third_party_updates; g_printf("Third Party?: %d\n", updater->settings_include_third_party_updates); updater_save_settings(updater); + backend_update_applet_icon(updater); } gboolean on_preferencesWindow_delete_event (GtkWidget *widget, GdkEvent *event, gpointer user_data) Modified: trunk/updater-gnome/src/updater-support.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-support.c?rev=8539&r1=8538&r2=8539&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-support.c (original) +++ trunk/updater-gnome/src/updater-support.c Thu Feb 7 17:48:00 2008 @@ -221,6 +221,74 @@ // ---------------------------------------------------------------------------- +void backend_update_applet_icon(SUSEUpdater *updater) +{ + gsize mandatory_count; + gsize optional_count; + + mandatory_count = 0; + optional_count = 0; + + /** + * update applet icon + */ + if (updater->settings_recommended_are_mandatory) + { + mandatory_count = mandatory_count + + updater->backend->security_updates_count + + updater->backend->security_restart_count + + updater->backend->recommended_updates_count + + updater->backend->recommended_restart_count; + + if (updater->settings_include_optional_patches) + { + optional_count = optional_count + updater->backend->optional_updates_count + + updater->backend->optional_restart_count; + } + + if (updater->settings_include_third_party_updates) + optional_count = optional_count + updater->backend->third_party_packages_count; + } + else + { + mandatory_count = mandatory_count + + updater->backend->security_updates_count + + updater->backend->security_restart_count; + + optional_count = optional_count + + updater->backend->recommended_updates_count + + updater->backend->recommended_restart_count; + + if (updater->settings_include_optional_patches) + { + optional_count = optional_count + updater->backend->optional_updates_count + + updater->backend->optional_restart_count; + } + + if (updater->settings_include_third_party_updates) + optional_count = optional_count + updater->backend->third_party_packages_count; + } + if (mandatory_count > 0) + { + updater_applet_set_icon(updater->applet, ICON_RED); + updater_applet_set_tooltip(updater->applet, _("Mandatory updates available")); + } + else if (optional_count > 0) + { + updater_applet_set_icon(updater->applet, ICON_YELLOW); + updater_applet_set_tooltip(updater->applet, _("Additional updates available")); + } + else + { + updater_applet_set_icon(updater->applet, ICON_GREEN); + updater_applet_set_tooltip(updater->applet, _("Your system is up-to-date")); + } + + // update the ui elements with new data + + updater_ui_update(updater); +} + void updater_ui_update(SUSEUpdater *updater) { gsize mandatory_count; Modified: trunk/updater-gnome/src/updater-support.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/updater-gnome/src/updater-support.h?rev=8539&r1=8538&r2=8539&view=diff ============================================================================== --- trunk/updater-gnome/src/updater-support.h (original) +++ trunk/updater-gnome/src/updater-support.h Thu Feb 7 17:48:00 2008 @@ -65,6 +65,8 @@ /** Checks if a file exists by trying to open it in a read-only mode. */ gboolean does_file_exist(const char *filename); +void backend_update_applet_icon(SUSEUpdater *udpater); + /** * Updates the UI according to settings and update data */ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org