# HG changeset patch # User Guido Berhoerster # Date 1391806606 -3600 # Node ID f6edbee6441f3182fe22f2d95b6cec3fc30f8541 # Parent db09b66c38535a8a7a496eb1c29ba9020421f5ee Stylistic fixes diff -r db09b66c3853 -r f6edbee6441f pkui-backend.c --- a/pkui-backend.c Fri Feb 07 18:31:52 2014 +0100 +++ b/pkui-backend.c Fri Feb 07 21:56:46 2014 +0100 @@ -28,17 +28,17 @@ struct _PkuiBackendPrivate { - PkuiBackend *backend; - PkClient *pk_client; - guint periodic_check_id; - guint updates_normal; - guint updates_important; - guint previous_updates_normal; - guint previous_updates_important; - guint startup_delay; - guint check_interval; - gint64 last_check; - gboolean inhibit_check; + PkuiBackend *backend; + PkClient *pk_client; + guint periodic_check_id; + guint updates_normal; + guint updates_important; + guint previous_updates_normal; + guint previous_updates_important; + guint startup_delay; + guint check_interval; + gint64 last_check; + gboolean inhibit_check; }; enum @@ -61,7 +61,7 @@ static guint pkui_backend_signals[LAST_SIGNAL] = { 0 }; -static gboolean periodic_check(gpointer data); +static gboolean periodic_check(gpointer data); static void pkui_backend_set_property(GObject *object, guint property_id, diff -r db09b66c3853 -r f6edbee6441f pkui-backend.h --- a/pkui-backend.h Fri Feb 07 18:31:52 2014 +0100 +++ b/pkui-backend.h Fri Feb 07 21:56:46 2014 +0100 @@ -44,9 +44,8 @@ struct _PkuiBackend { - GObject parent_instance; - - PkuiBackendPrivate *priv; + GObject parent_instance; + PkuiBackendPrivate *priv; }; struct _PkuiBackendClass @@ -54,15 +53,17 @@ GObjectClass parent_class; }; -PkuiBackend *pkui_backend_new(guint startup_delay, guint interval); -guint pkui_backend_get_updates_normal(PkuiBackend *self); -guint pkui_backend_get_updates_important(PkuiBackend *self); -void pkui_backend_set_inhibit_check(PkuiBackend *self, gboolean inhibit_check); -gboolean pkui_backend_get_inhibit_check(PkuiBackend *self); -void pkui_backend_set_check_interval(PkuiBackend *self, guint check_interval); -guint pkui_backend_get_check_interval(PkuiBackend *self); -guint pkui_backend_get_startup_interval(PkuiBackend *self); -void pkui_backend_check_now(PkuiBackend *self); +PkuiBackend *pkui_backend_new(guint startup_delay, guint interval); +guint pkui_backend_get_updates_normal(PkuiBackend *self); +guint pkui_backend_get_updates_important(PkuiBackend *self); +void pkui_backend_set_inhibit_check(PkuiBackend *self, + gboolean inhibit_check); +gboolean pkui_backend_get_inhibit_check(PkuiBackend *self); +void pkui_backend_set_check_interval(PkuiBackend *self, + guint check_interval); +guint pkui_backend_get_check_interval(PkuiBackend *self); +guint pkui_backend_get_startup_interval(PkuiBackend *self); +void pkui_backend_check_now(PkuiBackend *self); G_END_DECLS diff -r db09b66c3853 -r f6edbee6441f pkui-icon.c --- a/pkui-icon.c Fri Feb 07 18:31:52 2014 +0100 +++ b/pkui-icon.c Fri Feb 07 21:56:46 2014 +0100 @@ -39,13 +39,13 @@ NotifyNotification *notification; }; -static GtkWidget* icon_popup_menu_create(PkuiIcon *self); -static void icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, +static GtkWidget* icon_popup_menu_create(PkuiIcon *self); +static void icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data); -static void icon_activated(GtkStatusIcon *status_icon, gpointer user_data); -static void hide_notification(PkuiIcon *self); -static void backend_state_changed(PkuiBackend *backend, gpointer user_data); -static void update_viewer_exited(GPid pid, gint status, gpointer user_data); +static void icon_activated(GtkStatusIcon *status_icon, gpointer user_data); +static void hide_notification(PkuiIcon *self); +static void backend_state_changed(PkuiBackend *backend, gpointer user_data); +static void update_viewer_exited(GPid pid, gint status, gpointer user_data); static void pkui_icon_finalize(GObject *gobject) @@ -125,31 +125,32 @@ static void about_dialog_show(GtkMenuItem *item, gpointer user_data) { - static const gchar *copyright = "Copyright \xc2\xa9 2011 Guido " + static const gchar *copyright = "Copyright \xc2\xa9 2011 Guido " "Berhoerster\nCopyright \xc2\xa9 2011 Pavol Rusnak\n"; - static const gchar *authors[3] = { + static const gchar *authors[3] = { "Guido Berhoerster ", "Pavol Rusnak ", NULL }; - static const gchar *documenters[2] = { + static const gchar *documenters[2] = { "Guido Berhoerster ", NULL }; - static const gchar *license = - "Licensed under the GNU General Public License Version 2\n\nThis " - "program is free software; you can redistribute it and/or modify it" - " under the terms of the GNU General Public License as published by" - " the Free Software Foundation; either version 2 of the License, or" - " (at your option) any later version.\n\nThis program is " - "distributed in the hope that it will be useful, but WITHOUT ANY " - "WARRANTY; without even the implied warranty of MERCHANTABILITY or " - "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public " - "License for more details.\n\nYou should have received a copy of " - "the GNU General Public License along with this program; if not, " - "write to the Free Software Foundation, Inc., 51 Franklin Street, " - "Fifth Floor, Boston, MA 02110-1301 USA."; - const gchar *translators = _("translators"); + static const gchar *license = + "Licensed under the GNU General Public License Version 2\n\n" + "This program is free software; you can redistribute it and/or " + "modify it under the terms of the GNU General Public License as " + "published by the Free Software Foundation; either version 2 of " + "the License, or (at your option) any later version.\n\n" + "This program is distributed in the hope that it will be useful, " + "but WITHOUT ANY WARRANTY; without even the implied warranty of " + "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU " + "General Public License for more details.\n\n" + "You should have received a copy of the GNU General Public License " + "along with this program; if not, write to the Free Software " + "Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, " + "MA 02110-1301 USA."; + const gchar *translators = _("translators"); if (strcmp(translators, "translators") == 0) translators = NULL; @@ -202,7 +203,7 @@ icon_popup_menu_popup(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) { - PkuiIcon *self = PKUI_ICON(user_data); + PkuiIcon *self = PKUI_ICON(user_data); gtk_menu_popup(GTK_MENU(self->priv->status_icon_popup_menu), NULL, NULL, NULL, NULL, button, activate_time); @@ -212,7 +213,7 @@ notification_handle_action(NotifyNotification *notification, gchar *action, gpointer user_data) { - PkuiIcon *self = PKUI_ICON(user_data); + PkuiIcon *self = PKUI_ICON(user_data); if (strcmp(action, "install-updates") == 0) exec_update_viewer(self); @@ -222,13 +223,13 @@ update_notification(PkuiIcon *self, guint updates_normal, guint updates_important) { - gchar *message; - gchar *title = updates_important ? + gchar *message; + gchar *title = updates_important ? ngettext("Important Software Update", "Important Software Updates", updates_important + updates_normal) : ngettext("Software Update", "Software Updates", updates_important + updates_normal); - gchar *icon = updates_important ? "software-update-urgent" : + gchar *icon = updates_important ? "software-update-urgent" : "software-update-available"; if (updates_important > 0) diff -r db09b66c3853 -r f6edbee6441f pkui-icon.h --- a/pkui-icon.h Fri Feb 07 18:31:52 2014 +0100 +++ b/pkui-icon.h Fri Feb 07 21:56:46 2014 +0100 @@ -44,16 +44,16 @@ struct _PkuiIcon { - GObject parent_instance; - PkuiIconPrivate *priv; + GObject parent_instance; + PkuiIconPrivate *priv; }; struct _PkuiIconClass { - GObjectClass parent_class; + GObjectClass parent_class; }; -PkuiIcon *pkui_icon_new(guint startup_delay, guint check_interval); +PkuiIcon *pkui_icon_new(guint startup_delay, guint check_interval); G_END_DECLS