Signed-off-by: Nikola Pajkovsky npajkovs@redhat.com --- src/applet/Applet.cpp | 12 ++++++------ src/applet/CCApplet.cpp | 32 ++++++++++++++++---------------- src/applet/CCApplet.h | 18 +++++++++--------- 3 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp index 2f35cab..b00ae5f 100644 --- a/src/applet/Applet.cpp +++ b/src/applet/Applet.cpp @@ -80,8 +80,8 @@ static void Crash(DBusMessage* signal) if (package_name[0] == '\0') message = _("A crash has been detected"); //applet->AddEvent(uid, package_name); - SetIconTooltip(applet, message, package_name); - ShowIcon(applet); + set_icon_tooltip(applet, message, package_name); + show_icon(applet);
/* If this crash seems to be repeating, do not annoy user with popup dialog. * (The icon in the tray is not suppressed) @@ -103,7 +103,7 @@ static void Crash(DBusMessage* signal) free(last_crash_id); last_crash_id = xstrdup(crash_id);
- CrashNotify(applet, crash_id, message, package_name); + crash_notify(applet, crash_id, message, package_name); }
static void QuotaExceed(DBusMessage* signal) @@ -121,8 +121,8 @@ static void QuotaExceed(DBusMessage* signal)
//if (m_pSessionDBus->has_name("com.redhat.abrt.gui")) // return; - ShowIcon(applet); - MessageNotify(applet, "%s", str); + show_icon(applet); + message_notify(applet, "%s", str); }
static void NameOwnerChanged(DBusMessage* signal) @@ -159,7 +159,7 @@ static void NameOwnerChanged(DBusMessage* signal)
// hide icon if it's visible - as NM and don't show it, if it's not if (!new_owner[0]) - HideIcon(applet); + hide_icon(applet); }
static DBusHandlerResult handle_message(DBusConnection* conn, DBusMessage* msg, void* user_data) diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp index 4062bf7..d27ce28 100644 --- a/src/applet/CCApplet.cpp +++ b/src/applet/CCApplet.cpp @@ -48,7 +48,7 @@ static NotifyNotification *new_warn_notification() static void on_hide_cb(GtkMenuItem *menuitem, gpointer applet) { if (applet) - HideIcon((struct applet*)applet); + hide_icon((struct applet*)applet); }
static void on_about_cb(GtkMenuItem *menuitem, gpointer dialog) @@ -148,8 +148,8 @@ struct applet *applet_new(const char* app_name)
gtk_status_icon_set_visible(applet->status_icon, FALSE);
- g_signal_connect(G_OBJECT(applet->status_icon), "activate", GTK_SIGNAL_FUNC(OnAppletActivate_CB), applet); - g_signal_connect(G_OBJECT(applet->status_icon), "popup_menu", GTK_SIGNAL_FUNC(OnMenuPopup_cb), applet); + g_signal_connect(G_OBJECT(applet->status_icon), "activate", GTK_SIGNAL_FUNC(on_applet_activate_cb), applet); + g_signal_connect(G_OBJECT(applet->status_icon), "popup_menu", GTK_SIGNAL_FUNC(on_menu_popup_cb), applet);
// SetIconTooltip(_("Pending events: %i"), m_mapEvents.size());
@@ -165,7 +165,7 @@ void applet_destroy(struct applet *applet) free(applet); }
-void SetIconTooltip(struct applet *applet, const char *format, ...) +void set_icon_tooltip(struct applet *applet, const char *format, ...) { va_list args; int n; @@ -240,7 +240,7 @@ void action_open_gui(NotifyNotification *notification, gchar *action, gpointer u } }
-void CrashNotify(struct applet *applet, const char* crash_id, const char *format, ...) +void crash_notify(struct applet *applet, const char* crash_id, const char *format, ...) { applet->last_crash_id = crash_id; va_list args; @@ -267,7 +267,7 @@ void CrashNotify(struct applet *applet, const char* crash_id, const char *format } }
-void MessageNotify(struct applet *applet, const char *format, ...) +void message_notify(struct applet *applet, const char *format, ...) { va_list args;
@@ -294,7 +294,7 @@ void MessageNotify(struct applet *applet, const char *format, ...) } }
-void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data) +void on_applet_activate_cb(GtkStatusIcon *status_icon, gpointer user_data) { struct applet *applet = (struct applet*)user_data; if (applet->daemon_running) @@ -316,7 +316,7 @@ void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data) } }
-void OnMenuPopup_cb(GtkStatusIcon *status_icon, +void on_menu_popup_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data) @@ -334,7 +334,7 @@ void OnMenuPopup_cb(GtkStatusIcon *status_icon, } }
-void ShowIcon(struct applet *applet) +void show_icon(struct applet *applet) { gtk_status_icon_set_visible(applet->status_icon, true); /* only animate if all icons are loaded, use the "gtk-warning" instead */ @@ -342,13 +342,13 @@ void ShowIcon(struct applet *applet) animate_icon(applet); }
-void HideIcon(struct applet *applet) +void hide_icon(struct applet *applet) { gtk_status_icon_set_visible(applet->status_icon, false); stop_animate_icon(applet); }
-void Disable(struct applet *applet, const char *reason) +void disable(struct applet *applet, const char *reason) { /* FIXME: once we have our icon @@ -366,17 +366,17 @@ void Disable(struct applet *applet, const char *reason) } else error_msg("Can't load icon"); - SetIconTooltip(applet, reason); - ShowIcon(applet); + set_icon_tooltip(applet, reason); + show_icon(applet); }
-void Enable(struct applet *applet, const char *reason) +void enable(struct applet *applet, const char *reason) { /* restore the original icon */ applet->daemon_running = true; - SetIconTooltip(applet, reason); + set_icon_tooltip(applet, reason); gtk_status_icon_set_from_stock(applet->status_icon, GTK_STOCK_DIALOG_WARNING); - ShowIcon(applet); + show_icon(applet); }
// why it is not named with suffix _cb when it is callback for g_timeout_add? diff --git a/src/applet/CCApplet.h b/src/applet/CCApplet.h index 868302b..a7fb543 100644 --- a/src/applet/CCApplet.h +++ b/src/applet/CCApplet.h @@ -64,21 +64,21 @@ struct applet { struct applet* applet_new(const char *app_name); void applet_destroy(struct applet *applet);
-void ShowIcon(struct applet *applet); -void HideIcon(struct applet *applet); -void SetIconTooltip(struct applet *applet, const char *format, ...); -void CrashNotify(struct applet *applet, const char* crash_id, const char *format, ...); -void MessageNotify(struct applet *applet, const char *format, ...); -void Disable(struct applet *applet, const char *reason); -void Enable(struct applet *applet, const char *reason); +void show_icon(struct applet *applet); +void hide_icon(struct applet *applet); +void set_icon_tooltip(struct applet *applet, const char *format, ...); +void crash_notify(struct applet *applet, const char* crash_id, const char *format, ...); +void message_notify(struct applet *applet, const char *format, ...); +void disable(struct applet *applet, const char *reason); +void enable(struct applet *applet, const char *reason);
// static in next patch -void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data); +void on_applet_activate_cb(GtkStatusIcon *status_icon, gpointer user_data); //this action should open the reporter dialog directly, without showing the main window void action_report(NotifyNotification *notification, gchar *action, gpointer user_data); //this action should open the main window void action_open_gui(NotifyNotification *notification, gchar *action, gpointer user_data); -void OnMenuPopup_cb(GtkStatusIcon *status_icon, +void on_menu_popup_cb(GtkStatusIcon *status_icon, guint button, guint activate_time, gpointer user_data);