10:05 a.m.
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/Applet.cpp | 18 +++---
src/applet/CCApplet.cpp | 154 +++++++++++++++++++++++++----------------------
src/applet/CCApplet.h | 110 +++++++++++++++++----------------
3 files changed, 146 insertions(+), 136 deletions(-)
diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp
index be9c662..2f35cab 100644
--- a/src/applet/Applet.cpp
+++ b/src/applet/Applet.cpp
@@ -31,7 +31,7 @@
#include "CCApplet.h"
-static CApplet* applet;
+static struct applet* applet = NULL;
static void Crash(DBusMessage* signal)
@@ -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);
- applet->SetIconTooltip(message, package_name);
- applet->ShowIcon();
+ SetIconTooltip(applet, message, package_name);
+ ShowIcon(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);
- applet->CrashNotify(crash_id, message, package_name);
+ CrashNotify(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;
- applet->ShowIcon();
- applet->MessageNotify("%s", str);
+ ShowIcon(applet);
+ MessageNotify(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])
- applet->HideIcon();
+ HideIcon(applet);
}
static DBusHandlerResult handle_message(DBusConnection* conn, DBusMessage* msg, void*
user_data)
@@ -261,7 +261,7 @@ int main(int argc, char** argv)
/* Initialize GUI stuff.
* Note: inside CApplet ctor, libnotify hooks session dbus
* to glib main loop */
- applet = new CApplet(app_name);
+ applet = applet_new(app_name);
/* dbus_abrt cannot handle more than one bus, and we don't really need to.
* The only thing we want to do is to announce ourself on session dbus */
DBusConnection* session_conn = dbus_bus_get(DBUS_BUS_SESSION, &err);
@@ -291,6 +291,6 @@ int main(int argc, char** argv)
gtk_main();
gdk_threads_leave();
- delete applet;
+ applet_destroy(applet);
return 0;
}
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
index 4f6c2c6..587f568 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)
- ((CApplet*)applet)->HideIcon();
+ HideIcon((struct applet*)applet);
}
static void on_about_cb(GtkMenuItem *menuitem, gpointer dialog)
@@ -101,7 +101,7 @@ static GtkWidget *create_about_dialog()
return about_d;
}
-static GtkWidget *create_menu(CApplet *applet)
+static GtkWidget *create_menu(struct applet *applet)
{
GtkWidget *menu = gtk_menu_new();
GtkWidget *b_quit = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
@@ -126,59 +126,64 @@ static GtkWidget *create_menu(CApplet *applet)
return menu;
}
-CApplet::CApplet(const char* app_name)
+struct applet *applet_new(const char* app_name)
{
- m_bDaemonRunning = true;
+ struct applet *applet = (struct applet*)xmalloc(sizeof(struct applet));
+ applet->m_bDaemonRunning = true;
/* set-up icon buffers */
- m_iAnimator = 0;
- m_iAnimationStage = ICON_DEFAULT;
- m_bIconsLoaded = load_icons();
+ applet->m_iAnimator = 0;
+ applet->m_iAnimationStage = ICON_DEFAULT;
+ applet->m_bIconsLoaded = load_icons(applet);
/* - animation - */
- if (m_bIconsLoaded == true)
+ if (applet->m_bIconsLoaded == true)
{
//FIXME: animation is disabled for now
- m_pStatusIcon = gtk_status_icon_new_from_pixbuf(icon_stages_buff[ICON_DEFAULT]);
+ applet->m_pStatusIcon =
gtk_status_icon_new_from_pixbuf(applet->icon_stages_buff[ICON_DEFAULT]);
}
else
{
- m_pStatusIcon = gtk_status_icon_new_from_icon_name("abrt");
+ applet->m_pStatusIcon = gtk_status_icon_new_from_icon_name("abrt");
}
notify_init(app_name);
- gtk_status_icon_set_visible(m_pStatusIcon, FALSE);
+ gtk_status_icon_set_visible(applet->m_pStatusIcon, FALSE);
- g_signal_connect(G_OBJECT(m_pStatusIcon), "activate",
GTK_SIGNAL_FUNC(CApplet::OnAppletActivate_CB), this);
- g_signal_connect(G_OBJECT(m_pStatusIcon), "popup_menu",
GTK_SIGNAL_FUNC(CApplet::OnMenuPopup_cb), this);
+ g_signal_connect(G_OBJECT(applet->m_pStatusIcon), "activate",
GTK_SIGNAL_FUNC(OnAppletActivate_CB), applet);
+ g_signal_connect(G_OBJECT(applet->m_pStatusIcon), "popup_menu",
GTK_SIGNAL_FUNC(OnMenuPopup_cb), applet);
// SetIconTooltip(_("Pending events: %i"), m_mapEvents.size());
- m_pMenu = create_menu(this);
+ applet->m_pMenu = create_menu(applet);
+ return applet;
}
-CApplet::~CApplet()
+void applet_destroy(struct applet *applet)
{
if (notify_is_initted())
notify_uninit();
+
+ free(applet);
}
-void CApplet::SetIconTooltip(const char *format, ...)
+void SetIconTooltip(struct applet *applet, const char *format, ...)
{
va_list args;
int n;
char *buf;
+ // xvasprintf?
va_start(args, format);
buf = NULL;
n = vasprintf(&buf, format, args);
va_end(args);
- gtk_status_icon_set_tooltip_text(m_pStatusIcon, (n >= 0 && buf) ? buf :
"");
+ gtk_status_icon_set_tooltip_text(applet->m_pStatusIcon, (n >= 0 && buf)
? buf : "");
free(buf);
}
-void CApplet::action_report(NotifyNotification *notification, gchar *action, gpointer
user_data)
+void action_report(NotifyNotification *notification, gchar *action, gpointer user_data)
{
- CApplet *applet = (CApplet *)user_data;
+ struct applet *applet = (struct applet *)user_data;
if (applet->m_bDaemonRunning)
{
pid_t pid = vfork();
@@ -202,13 +207,13 @@ void CApplet::action_report(NotifyNotification *notification, gchar
*action, gpo
g_error_free(err);
}
gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
- applet->stop_animate_icon();
+ stop_animate_icon(applet);
}
}
-void CApplet::action_open_gui(NotifyNotification *notification, gchar *action, gpointer
user_data)
+void action_open_gui(NotifyNotification *notification, gchar *action, gpointer
user_data)
{
- CApplet *applet = (CApplet *)user_data;
+ struct applet *applet = (struct applet*)user_data;
if (applet->m_bDaemonRunning)
{
pid_t pid = vfork();
@@ -231,13 +236,13 @@ void CApplet::action_open_gui(NotifyNotification *notification,
gchar *action, g
g_error_free(err);
}
gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
- applet->stop_animate_icon();
+ stop_animate_icon(applet);
}
}
-void CApplet::CrashNotify(const char* crash_id, const char *format, ...)
+void CrashNotify(struct applet *applet, const char* crash_id, const char *format, ...)
{
- m_pLastCrashID = crash_id;
+ applet->m_pLastCrashID = crash_id;
va_list args;
va_start(args, format);
char *buf = xvasprintf(format, args);
@@ -245,11 +250,11 @@ void CApplet::CrashNotify(const char* crash_id, const char *format,
...)
NotifyNotification *notification = new_warn_notification();
notify_notification_add_action(notification, "REPORT",
_("Report"),
- NOTIFY_ACTION_CALLBACK(CApplet::action_report),
- this, NULL);
+ NOTIFY_ACTION_CALLBACK(action_report),
+ applet, NULL);
notify_notification_add_action(notification, "OPEN_MAIN_WINDOW",
_("Open ABRT"),
- NOTIFY_ACTION_CALLBACK(CApplet::action_open_gui),
- this, NULL);
+ NOTIFY_ACTION_CALLBACK(action_open_gui),
+ applet, NULL);
notify_notification_update(notification, _("Warning"), buf, NULL);
free(buf);
@@ -262,7 +267,7 @@ void CApplet::CrashNotify(const char* crash_id, const char *format,
...)
}
}
-void CApplet::MessageNotify(const char *format, ...)
+void MessageNotify(struct applet *applet, const char *format, ...)
{
va_list args;
@@ -276,8 +281,8 @@ void CApplet::MessageNotify(const char *format, ...)
*/
NotifyNotification *notification = new_warn_notification();
notify_notification_add_action(notification, "OPEN_MAIN_WINDOW",
_("Open ABRT"),
- NOTIFY_ACTION_CALLBACK(CApplet::action_open_gui),
- this, NULL);
+ NOTIFY_ACTION_CALLBACK(action_open_gui),
+ applet, NULL);
notify_notification_update(notification, _("Warning"), buf, NULL);
free(buf);
GError *err = NULL;
@@ -289,9 +294,9 @@ void CApplet::MessageNotify(const char *format, ...)
}
}
-void CApplet::OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data)
+void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data)
{
- CApplet *applet = (CApplet *)user_data;
+ struct applet *applet = (struct applet*)user_data;
if (applet->m_bDaemonRunning)
{
pid_t pid = vfork();
@@ -307,48 +312,48 @@ void CApplet::OnAppletActivate_CB(GtkStatusIcon *status_icon,
gpointer user_data
perror_msg_and_die("Can't execute abrt-gui");
}
gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
- applet->stop_animate_icon();
+ stop_animate_icon(applet);
}
}
-void CApplet::OnMenuPopup_cb(GtkStatusIcon *status_icon,
- guint button,
- guint activate_time,
- gpointer user_data)
+void OnMenuPopup_cb(GtkStatusIcon *status_icon,
+ guint button,
+ guint activate_time,
+ gpointer user_data)
{
- CApplet *applet = (CApplet *)user_data;
+ struct applet *applet = (struct applet*)user_data;
/* stop the animation */
- applet->stop_animate_icon();
+ stop_animate_icon(applet);
if (applet->m_pMenu != NULL)
{
- gtk_menu_popup(GTK_MENU(((CApplet *)user_data)->m_pMenu),
+ gtk_menu_popup(GTK_MENU(applet->m_pMenu),
NULL, NULL,
gtk_status_icon_position_menu,
status_icon, button, activate_time);
}
}
-void CApplet::ShowIcon()
+void ShowIcon(struct applet *applet)
{
- gtk_status_icon_set_visible(m_pStatusIcon, true);
+ gtk_status_icon_set_visible(applet->m_pStatusIcon, true);
/* only animate if all icons are loaded, use the "gtk-warning" instead */
- if (m_bIconsLoaded)
- animate_icon();
+ if (applet->m_bIconsLoaded)
+ animate_icon(applet);
}
-void CApplet::HideIcon()
+void HideIcon(struct applet *applet)
{
- gtk_status_icon_set_visible(m_pStatusIcon, false);
- stop_animate_icon();
+ gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
+ stop_animate_icon(applet);
}
-void CApplet::Disable(const char *reason)
+void Disable(struct applet *applet, const char *reason)
{
/*
FIXME: once we have our icon
*/
- m_bDaemonRunning = false;
+ applet->m_bDaemonRunning = false;
GdkPixbuf *gray_scaled;
GdkPixbuf *pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
GTK_STOCK_DIALOG_WARNING, 24, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
@@ -356,27 +361,28 @@ void CApplet::Disable(const char *reason)
{
gray_scaled = gdk_pixbuf_copy(pixbuf);
gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, false);
- gtk_status_icon_set_from_pixbuf(m_pStatusIcon, gray_scaled);
+ gtk_status_icon_set_from_pixbuf(applet->m_pStatusIcon, gray_scaled);
//do we need to free pixbufs nere?
}
else
error_msg("Can't load icon");
- SetIconTooltip(reason);
- ShowIcon();
+ SetIconTooltip(applet, reason);
+ ShowIcon(applet);
}
-void CApplet::Enable(const char *reason)
+void Enable(struct applet *applet, const char *reason)
{
/* restore the original icon */
- m_bDaemonRunning = true;
- SetIconTooltip(reason);
- gtk_status_icon_set_from_stock(m_pStatusIcon, GTK_STOCK_DIALOG_WARNING);
- ShowIcon();
+ applet->m_bDaemonRunning = true;
+ SetIconTooltip(applet, reason);
+ gtk_status_icon_set_from_stock(applet->m_pStatusIcon, GTK_STOCK_DIALOG_WARNING);
+ ShowIcon(applet);
}
-gboolean CApplet::update_icon(void *user_data)
+// why it is not named with suffix _cb when it is callback for g_timeout_add?
+gboolean update_icon(void *user_data)
{
- CApplet* applet = (CApplet*)user_data;
+ struct applet *applet = (struct applet*)user_data;
if (applet->m_pStatusIcon && applet->m_iAnimationStage <
ICON_STAGE_LAST)
{
gtk_status_icon_set_from_pixbuf(applet->m_pStatusIcon,
@@ -388,32 +394,34 @@ gboolean CApplet::update_icon(void *user_data)
}
if (--applet->m_iAnimCountdown == 0)
{
- applet->stop_animate_icon();
+ stop_animate_icon(applet);
}
return true;
}
-void CApplet::animate_icon()
+void animate_icon(struct applet* applet)
{
- if (m_iAnimator == 0)
+ if (applet->m_iAnimator == 0)
{
- m_iAnimator = g_timeout_add(100, update_icon, this);
- m_iAnimCountdown = 10 * 3; /* 3 sec */
+ applet->m_iAnimator = g_timeout_add(100, update_icon, applet);
+ applet->m_iAnimCountdown = 10 * 3; /* 3 sec */
}
}
-void CApplet::stop_animate_icon()
+void stop_animate_icon(struct applet *applet)
{
/* animator should be 0 if icons are not loaded, so this should be safe */
- if (m_iAnimator != 0)
+ if (applet->m_iAnimator != 0)
{
- g_source_remove(m_iAnimator);
- gtk_status_icon_set_from_pixbuf(m_pStatusIcon, icon_stages_buff[ICON_DEFAULT]);
- m_iAnimator = 0;
+ g_source_remove(applet->m_iAnimator);
+ gtk_status_icon_set_from_pixbuf(applet->m_pStatusIcon,
+ applet->icon_stages_buff[ICON_DEFAULT]
+ );
+ applet->m_iAnimator = 0;
}
}
-bool CApplet::load_icons()
+bool load_icons(struct applet *applet)
{
//FIXME: just a tmp workaround
return false;
@@ -424,7 +432,7 @@ bool CApplet::load_icons()
GError *error = NULL;
if (snprintf(name, sizeof(ICON_DIR"/abrt%02d.png"),
ICON_DIR"/abrt%02d.png", stage) > 0)
{
- icon_stages_buff[stage] = gdk_pixbuf_new_from_file(name, &error);
+ applet->icon_stages_buff[stage] = gdk_pixbuf_new_from_file(name,
&error);
if (error != NULL)
{
error_msg("Can't load pixbuf from %s, animation is
disabled", name);
diff --git a/src/applet/CCApplet.h b/src/applet/CCApplet.h
index a58ec68..528f134 100644
--- a/src/applet/CCApplet.h
+++ b/src/applet/CCApplet.h
@@ -24,65 +24,67 @@
#include <string>
#include <libnotify/notify.h>
-class CApplet
+enum ICON_STAGES
{
- private:
- GtkStatusIcon* m_pStatusIcon;
- GtkWidget *m_pMenu;
+ ICON_DEFAULT,
+ ICON_STAGE1,
+ ICON_STAGE2,
+ ICON_STAGE3,
+ ICON_STAGE4,
+ ICON_STAGE5,
+ /* this must be always the last */
+ ICON_STAGE_LAST
+};
-// std::map<int, std::string> m_mapEvents;
- bool m_bDaemonRunning;
- int m_iAnimationStage;
- guint m_iAnimator;
- unsigned m_iAnimCountdown;
- bool m_bIconsLoaded;
- const char *m_pLastCrashID;
+/*
+ * What is better name for struct?
+ *
+ * typedef struct _applet {
+ * ...
+ * } applet_t;
+ *
+ * or
+ */
- enum ICON_STAGES
- {
- ICON_DEFAULT,
- ICON_STAGE1,
- ICON_STAGE2,
- ICON_STAGE3,
- ICON_STAGE4,
- ICON_STAGE5,
- /* this must be always the last */
- ICON_STAGE_LAST
- } icon_stages;
- GdkPixbuf *icon_stages_buff[ICON_STAGE_LAST];
+struct applet {
+ GtkStatusIcon* m_pStatusIcon;
+ GtkWidget *m_pMenu;
- public:
- CApplet(const char* app_name);
- ~CApplet();
- void ShowIcon();
- void HideIcon();
- void SetIconTooltip(const char *format, ...);
- void CrashNotify(const char* crash_id, const char *format, ...);
- void MessageNotify(const char *format, ...);
- void Disable(const char *reason);
- void Enable(const char *reason);
- // create some event storage, to let user choose
- // or ask the daemon every time?
- // maybe just events which occured during current session
- // map::
-// int AddEvent(int pUUID, const char *pProgname);
-// int RemoveEvent(int pUUID);
+// std::map<int, std::string> m_mapEvents;
+ bool m_bDaemonRunning;
+ int m_iAnimationStage;
+ guint m_iAnimator;
+ unsigned m_iAnimCountdown;
+ bool m_bIconsLoaded;
+ const char *m_pLastCrashID;
- protected:
- //@@TODO applet menus
- static void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data);
- //this action should open the reporter dialog directly, without showing the main
window
- static void action_report(NotifyNotification *notification, gchar *action,
gpointer user_data);
- //this action should open the main window
- static void action_open_gui(NotifyNotification *notification, gchar *action,
gpointer user_data);
- static void OnMenuPopup_cb(GtkStatusIcon *status_icon,
- guint button,
- guint activate_time,
- gpointer user_data);
- static gboolean update_icon(void *data);
- void animate_icon();
- void stop_animate_icon();
- bool load_icons();
+ GdkPixbuf *icon_stages_buff[ICON_STAGE_LAST];
};
+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);
+
+// static in next patch
+void OnAppletActivate_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,
+ guint button,
+ guint activate_time,
+ gpointer user_data);
+gboolean update_icon(void *data);
+void animate_icon(struct applet *applet);
+void stop_animate_icon(struct applet *applet);
+bool load_icons(struct applet *applet);
+
#endif
--
1.7.1
10:05 a.m.
New subject: [PATCH 2/7] lower case variable in struct applet
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/CCApplet.cpp | 84 +++++++++++++++++++++++-----------------------
src/applet/CCApplet.h | 16 ++++----
2 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
index 587f568..4062bf7 100644
--- a/src/applet/CCApplet.cpp
+++ b/src/applet/CCApplet.cpp
@@ -129,31 +129,31 @@ static GtkWidget *create_menu(struct applet *applet)
struct applet *applet_new(const char* app_name)
{
struct applet *applet = (struct applet*)xmalloc(sizeof(struct applet));
- applet->m_bDaemonRunning = true;
+ applet->daemon_running = true;
/* set-up icon buffers */
- applet->m_iAnimator = 0;
- applet->m_iAnimationStage = ICON_DEFAULT;
- applet->m_bIconsLoaded = load_icons(applet);
+ applet->animator = 0;
+ applet->animation_stage = ICON_DEFAULT;
+ applet->icons_loaded = load_icons(applet);
/* - animation - */
- if (applet->m_bIconsLoaded == true)
+ if (applet->icons_loaded == true)
{
//FIXME: animation is disabled for now
- applet->m_pStatusIcon =
gtk_status_icon_new_from_pixbuf(applet->icon_stages_buff[ICON_DEFAULT]);
+ applet->status_icon =
gtk_status_icon_new_from_pixbuf(applet->icon_stages_buff[ICON_DEFAULT]);
}
else
{
- applet->m_pStatusIcon = gtk_status_icon_new_from_icon_name("abrt");
+ applet->status_icon = gtk_status_icon_new_from_icon_name("abrt");
}
notify_init(app_name);
- gtk_status_icon_set_visible(applet->m_pStatusIcon, FALSE);
+ gtk_status_icon_set_visible(applet->status_icon, FALSE);
- g_signal_connect(G_OBJECT(applet->m_pStatusIcon), "activate",
GTK_SIGNAL_FUNC(OnAppletActivate_CB), applet);
- g_signal_connect(G_OBJECT(applet->m_pStatusIcon), "popup_menu",
GTK_SIGNAL_FUNC(OnMenuPopup_cb), applet);
+ 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);
// SetIconTooltip(_("Pending events: %i"), m_mapEvents.size());
- applet->m_pMenu = create_menu(applet);
+ applet->menu = create_menu(applet);
return applet;
}
@@ -177,21 +177,21 @@ void SetIconTooltip(struct applet *applet, const char *format, ...)
n = vasprintf(&buf, format, args);
va_end(args);
- gtk_status_icon_set_tooltip_text(applet->m_pStatusIcon, (n >= 0 && buf)
? buf : "");
+ gtk_status_icon_set_tooltip_text(applet->status_icon, (n >= 0 && buf) ?
buf : "");
free(buf);
}
void action_report(NotifyNotification *notification, gchar *action, gpointer user_data)
{
struct applet *applet = (struct applet *)user_data;
- if (applet->m_bDaemonRunning)
+ if (applet->daemon_running)
{
pid_t pid = vfork();
if (pid < 0)
perror_msg("vfork");
if (pid == 0)
{ /* child */
- char *buf = xasprintf("--report=%s", applet->m_pLastCrashID);
+ char *buf = xasprintf("--report=%s", applet->last_crash_id);
signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
execl(BIN_DIR"/abrt-gui", "abrt-gui", buf, (char*)
NULL);
/* Did not find abrt-gui in installation directory. Oh well */
@@ -206,7 +206,7 @@ void action_report(NotifyNotification *notification, gchar *action,
gpointer use
error_msg("%s", err->message);
g_error_free(err);
}
- gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
+ gtk_status_icon_set_visible(applet->status_icon, false);
stop_animate_icon(applet);
}
}
@@ -214,7 +214,7 @@ void action_report(NotifyNotification *notification, gchar *action,
gpointer use
void action_open_gui(NotifyNotification *notification, gchar *action, gpointer
user_data)
{
struct applet *applet = (struct applet*)user_data;
- if (applet->m_bDaemonRunning)
+ if (applet->daemon_running)
{
pid_t pid = vfork();
if (pid < 0)
@@ -235,14 +235,14 @@ void action_open_gui(NotifyNotification *notification, gchar
*action, gpointer u
error_msg("%s", err->message);
g_error_free(err);
}
- gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
+ gtk_status_icon_set_visible(applet->status_icon, false);
stop_animate_icon(applet);
}
}
void CrashNotify(struct applet *applet, const char* crash_id, const char *format, ...)
{
- applet->m_pLastCrashID = crash_id;
+ applet->last_crash_id = crash_id;
va_list args;
va_start(args, format);
char *buf = xvasprintf(format, args);
@@ -297,7 +297,7 @@ void MessageNotify(struct applet *applet, const char *format, ...)
void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer user_data)
{
struct applet *applet = (struct applet*)user_data;
- if (applet->m_bDaemonRunning)
+ if (applet->daemon_running)
{
pid_t pid = vfork();
if (pid < 0)
@@ -311,7 +311,7 @@ void OnAppletActivate_CB(GtkStatusIcon *status_icon, gpointer
user_data)
execlp("abrt-gui", "abrt-gui", (char*) NULL);
perror_msg_and_die("Can't execute abrt-gui");
}
- gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
+ gtk_status_icon_set_visible(applet->status_icon, false);
stop_animate_icon(applet);
}
}
@@ -325,9 +325,9 @@ void OnMenuPopup_cb(GtkStatusIcon *status_icon,
/* stop the animation */
stop_animate_icon(applet);
- if (applet->m_pMenu != NULL)
+ if (applet->menu != NULL)
{
- gtk_menu_popup(GTK_MENU(applet->m_pMenu),
+ gtk_menu_popup(GTK_MENU(applet->menu),
NULL, NULL,
gtk_status_icon_position_menu,
status_icon, button, activate_time);
@@ -336,15 +336,15 @@ void OnMenuPopup_cb(GtkStatusIcon *status_icon,
void ShowIcon(struct applet *applet)
{
- gtk_status_icon_set_visible(applet->m_pStatusIcon, true);
+ gtk_status_icon_set_visible(applet->status_icon, true);
/* only animate if all icons are loaded, use the "gtk-warning" instead */
- if (applet->m_bIconsLoaded)
+ if (applet->icons_loaded)
animate_icon(applet);
}
void HideIcon(struct applet *applet)
{
- gtk_status_icon_set_visible(applet->m_pStatusIcon, false);
+ gtk_status_icon_set_visible(applet->status_icon, false);
stop_animate_icon(applet);
}
@@ -353,7 +353,7 @@ void Disable(struct applet *applet, const char *reason)
/*
FIXME: once we have our icon
*/
- applet->m_bDaemonRunning = false;
+ applet->daemon_running = false;
GdkPixbuf *gray_scaled;
GdkPixbuf *pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
GTK_STOCK_DIALOG_WARNING, 24, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
@@ -361,7 +361,7 @@ void Disable(struct applet *applet, const char *reason)
{
gray_scaled = gdk_pixbuf_copy(pixbuf);
gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, false);
- gtk_status_icon_set_from_pixbuf(applet->m_pStatusIcon, gray_scaled);
+ gtk_status_icon_set_from_pixbuf(applet->status_icon, gray_scaled);
//do we need to free pixbufs nere?
}
else
@@ -373,9 +373,9 @@ void Disable(struct applet *applet, const char *reason)
void Enable(struct applet *applet, const char *reason)
{
/* restore the original icon */
- applet->m_bDaemonRunning = true;
+ applet->daemon_running = true;
SetIconTooltip(applet, reason);
- gtk_status_icon_set_from_stock(applet->m_pStatusIcon, GTK_STOCK_DIALOG_WARNING);
+ gtk_status_icon_set_from_stock(applet->status_icon, GTK_STOCK_DIALOG_WARNING);
ShowIcon(applet);
}
@@ -383,16 +383,16 @@ void Enable(struct applet *applet, const char *reason)
gboolean update_icon(void *user_data)
{
struct applet *applet = (struct applet*)user_data;
- if (applet->m_pStatusIcon && applet->m_iAnimationStage <
ICON_STAGE_LAST)
+ if (applet->status_icon && applet->animation_stage <
ICON_STAGE_LAST)
{
- gtk_status_icon_set_from_pixbuf(applet->m_pStatusIcon,
-
applet->icon_stages_buff[applet->m_iAnimationStage++]);
+ gtk_status_icon_set_from_pixbuf(applet->status_icon,
+
applet->icon_stages_buff[applet->animation_stage++]);
}
- if (applet->m_iAnimationStage == ICON_STAGE_LAST)
+ if (applet->animation_stage == ICON_STAGE_LAST)
{
- applet->m_iAnimationStage = 0;
+ applet->animation_stage = 0;
}
- if (--applet->m_iAnimCountdown == 0)
+ if (--applet->anim_countdown == 0)
{
stop_animate_icon(applet);
}
@@ -401,23 +401,23 @@ gboolean update_icon(void *user_data)
void animate_icon(struct applet* applet)
{
- if (applet->m_iAnimator == 0)
+ if (applet->animator == 0)
{
- applet->m_iAnimator = g_timeout_add(100, update_icon, applet);
- applet->m_iAnimCountdown = 10 * 3; /* 3 sec */
+ applet->animator = g_timeout_add(100, update_icon, applet);
+ applet->anim_countdown = 10 * 3; /* 3 sec */
}
}
void stop_animate_icon(struct applet *applet)
{
/* animator should be 0 if icons are not loaded, so this should be safe */
- if (applet->m_iAnimator != 0)
+ if (applet->animator != 0)
{
- g_source_remove(applet->m_iAnimator);
- gtk_status_icon_set_from_pixbuf(applet->m_pStatusIcon,
+ g_source_remove(applet->animator);
+ gtk_status_icon_set_from_pixbuf(applet->status_icon,
applet->icon_stages_buff[ICON_DEFAULT]
);
- applet->m_iAnimator = 0;
+ applet->animator = 0;
}
}
diff --git a/src/applet/CCApplet.h b/src/applet/CCApplet.h
index 528f134..868302b 100644
--- a/src/applet/CCApplet.h
+++ b/src/applet/CCApplet.h
@@ -47,16 +47,16 @@ enum ICON_STAGES
*/
struct applet {
- GtkStatusIcon* m_pStatusIcon;
- GtkWidget *m_pMenu;
+ GtkStatusIcon* status_icon;
+ GtkWidget *menu;
// std::map<int, std::string> m_mapEvents;
- bool m_bDaemonRunning;
- int m_iAnimationStage;
- guint m_iAnimator;
- unsigned m_iAnimCountdown;
- bool m_bIconsLoaded;
- const char *m_pLastCrashID;
+ bool daemon_running;
+ int animation_stage;
+ guint animator;
+ unsigned anim_countdown;
+ bool icons_loaded;
+ const char *last_crash_id;
GdkPixbuf *icon_stages_buff[ICON_STAGE_LAST];
};
--
1.7.1
10:32 a.m.
New subject: [PATCH 2/7] lower case variable in struct applet
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/CCApplet.cpp | 84 +++++++++++++++++++++++-----------------------
src/applet/CCApplet.h | 16 ++++----
2 files changed, 50 insertions(+), 50 deletions(-)
Looks ok to me.
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
index 587f568..4062bf7 100644
--- a/src/applet/CCApplet.cpp
+++ b/src/applet/CCApplet.cpp
@@ -129,31 +129,31 @@ static GtkWidget *create_menu(struct applet *applet)
struct applet *applet_new(const char* app_name)
{
struct applet *applet = (struct applet*)xmalloc(sizeof(struct applet));
BTW, if you use x*z*alloc, you can drop some zero assignments below:
- applet->m_bDaemonRunning = true;
+ applet->daemon_running = true;
/* set-up icon buffers */
- applet->m_iAnimator = 0;
- applet->m_iAnimationStage = ICON_DEFAULT;
- applet->m_bIconsLoaded = load_icons(applet);
+ applet->animator = 0; <========================= xzalloc would do it
+ applet->animation_stage = ICON_DEFAULT; <========= ICON_DEFAULT is 0 too
Just commenting out the second like in unsafe - what if ICON_DEFAULT
changes in the future?
To drop ICON_DEFAULT assignment safely, you can write it as
if (ICON_DEFAULT != 0)
applet->animation_stage = ICON_DEFAULT;
struct applet {
- GtkStatusIcon* m_pStatusIcon;
- GtkWidget *m_pMenu;
+ GtkStatusIcon* status_icon;
+ GtkWidget *menu;
Ever wondered why struct stat's members are all named "st_foo"?
Or struct timeval members are named "tv_foo"?
It is done intentionally to make grepping for them easier:
member names like "mode" or "sec" are too generic.
I am not saying we *must* name applet's members "ap_menu" etc.
But in some other structure renames we might be better using this
scheme.
--
vda
10:37 a.m.
New subject: [PATCH 2/7] lower case variable in struct applet
On 08/27/2010 05:32 PM, Denys Vlasenko wrote:
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
> Signed-off-by: Nikola Pajkovsky<npajkovs(a)redhat.com>
> ---
> src/applet/CCApplet.cpp | 84 +++++++++++++++++++++++-----------------------
> src/applet/CCApplet.h | 16 ++++----
> 2 files changed, 50 insertions(+), 50 deletions(-)
Looks ok to me.
> diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
> index 587f568..4062bf7 100644
> --- a/src/applet/CCApplet.cpp
> +++ b/src/applet/CCApplet.cpp
> @@ -129,31 +129,31 @@ static GtkWidget *create_menu(struct applet *applet)
> struct applet *applet_new(const char* app_name)
> {
> struct applet *applet = (struct applet*)xmalloc(sizeof(struct applet));
BTW, if you use x*z*alloc, you can drop some zero assignments below:
> - applet->m_bDaemonRunning = true;
> + applet->daemon_running = true;
> /* set-up icon buffers */
> - applet->m_iAnimator = 0;
> - applet->m_iAnimationStage = ICON_DEFAULT;
> - applet->m_bIconsLoaded = load_icons(applet);
> + applet->animator = 0;<========================= xzalloc would do it
> + applet->animation_stage = ICON_DEFAULT;<========= ICON_DEFAULT is 0 too
Just commenting out the second like in unsafe - what if ICON_DEFAULT
changes in the future?
To drop ICON_DEFAULT assignment safely, you can write it as
if (ICON_DEFAULT != 0)
applet->animation_stage = ICON_DEFAULT;
> struct applet {
> - GtkStatusIcon* m_pStatusIcon;
> - GtkWidget *m_pMenu;
> + GtkStatusIcon* status_icon;
> + GtkWidget *menu;
Ever wondered why struct stat's members are all named "st_foo"?
Or struct timeval members are named "tv_foo"?
yes :)
It is done intentionally to make grepping for them easier:
member names like "mode" or "sec" are too generic.
I am not saying we *must* name applet's members "ap_menu" etc.
But in some other structure renames we might be better using this
scheme.
Could you add this into code style? I will use it.
10:05 a.m.
New subject: [PATCH 3/7] lower case and underscore funtions
Signed-off-by: Nikola Pajkovsky <npajkovs(a)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);
--
1.7.1
10:38 a.m.
New subject: [PATCH 3/7] lower case and underscore funtions
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)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);
CrashNotify is a bad name in general. Do we crash notify when we call
it? No, we display crash notification.
MessageNotify is another bad name, and needs changing.
The rest looks ok.
--
vda
6:39 a.m.
New subject: [PATCH 3/7] lower case and underscore funtions
On 08/27/2010 05:38 PM, Denys Vlasenko wrote:
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
> Signed-off-by: Nikola Pajkovsky<npajkovs(a)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);
CrashNotify is a bad name in general. Do we crash notify when we call
it? No, we display crash notification.
show_crash_notification?
MessageNotify is another bad name, and needs changing.
show_msg_notification?
The rest looks ok.
7:04 a.m.
New subject: [PATCH 3/7] lower case and underscore funtions
On Mon, 2010-08-30 at 13:39 +0200, Nikola Pajkovsky wrote:
On 08/27/2010 05:38 PM, Denys Vlasenko wrote:
> On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
>> Signed-off-by: Nikola Pajkovsky<npajkovs(a)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);
>
> CrashNotify is a bad name in general. Do we crash notify when we call
> it? No, we display crash notification.
>
show_crash_notification?
> MessageNotify is another bad name, and needs changing.
>
show_msg_notification?
Yes, good names.
--
vda
10:05 a.m.
New subject: [PATCH 4/7] make some function static
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/CCApplet.cpp | 329 ++++++++++++++++++++++++-----------------------
src/applet/CCApplet.h | 15 --
2 files changed, 165 insertions(+), 179 deletions(-)
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
index d27ce28..0e292bb 100644
--- a/src/applet/CCApplet.cpp
+++ b/src/applet/CCApplet.cpp
@@ -22,6 +22,149 @@
#include "abrtlib.h"
#include "CCApplet.h"
+static bool load_icons(struct applet *applet)
+{
+ //FIXME: just a tmp workaround
+ return false;
+ int stage;
+ for (stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++)
+ {
+ char name[sizeof(ICON_DIR"/abrt%02d.png")];
+ GError *error = NULL;
+ if (snprintf(name, sizeof(ICON_DIR"/abrt%02d.png"),
ICON_DIR"/abrt%02d.png", stage) > 0)
+ {
+ applet->icon_stages_buff[stage] = gdk_pixbuf_new_from_file(name,
&error);
+ if (error != NULL)
+ {
+ error_msg("Can't load pixbuf from %s, animation is
disabled", name);
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+static void stop_animate_icon(struct applet *applet)
+{
+ /* animator should be 0 if icons are not loaded, so this should be safe */
+ if (applet->animator != 0)
+ {
+ g_source_remove(applet->animator);
+ gtk_status_icon_set_from_pixbuf(applet->status_icon,
+ applet->icon_stages_buff[ICON_DEFAULT]
+ );
+ applet->animator = 0;
+ }
+}
+
+//this action should open the reporter dialog directly, without showing the main window
+static void action_report(NotifyNotification *notification, gchar *action, gpointer
user_data)
+{
+ struct applet *applet = (struct applet *)user_data;
+ if (applet->daemon_running)
+ {
+ pid_t pid = vfork();
+ if (pid < 0)
+ perror_msg("vfork");
+ if (pid == 0)
+ { /* child */
+ char *buf = xasprintf("--report=%s", applet->last_crash_id);
+ signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
+ execl(BIN_DIR"/abrt-gui", "abrt-gui", buf, (char*)
NULL);
+ /* Did not find abrt-gui in installation directory. Oh well */
+ /* Trying to find it in PATH */
+ execlp("abrt-gui", "abrt-gui", buf, (char*) NULL);
+ perror_msg_and_die("Can't execute abrt-gui");
+ }
+ GError *err = NULL;
+ notify_notification_close(notification, &err);
+ if (err != NULL)
+ {
+ error_msg("%s", err->message);
+ g_error_free(err);
+ }
+ gtk_status_icon_set_visible(applet->status_icon, false);
+ stop_animate_icon(applet);
+ }
+}
+
+//this action should open the main window
+static void action_open_gui(NotifyNotification *notification, gchar *action, gpointer
user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ if (applet->daemon_running)
+ {
+ pid_t pid = vfork();
+ if (pid < 0)
+ perror_msg("vfork");
+ if (pid == 0)
+ { /* child */
+ signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
+ execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
+ /* Did not find abrt-gui in installation directory. Oh well */
+ /* Trying to find it in PATH */
+ execlp("abrt-gui", "abrt-gui", (char*) NULL);
+ perror_msg_and_die("Can't execute abrt-gui");
+ }
+ GError *err = NULL;
+ notify_notification_close(notification, &err);
+ if (err != NULL)
+ {
+ error_msg("%s", err->message);
+ g_error_free(err);
+ }
+ gtk_status_icon_set_visible(applet->status_icon, false);
+ stop_animate_icon(applet);
+ }
+}
+
+static void on_menu_popup_cb(GtkStatusIcon *status_icon,
+ guint button,
+ guint activate_time,
+ gpointer user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ /* stop the animation */
+ stop_animate_icon(applet);
+
+ if (applet->menu != NULL)
+ {
+ gtk_menu_popup(GTK_MENU(applet->menu),
+ NULL, NULL,
+ gtk_status_icon_position_menu,
+ status_icon, button, activate_time);
+ }
+}
+
+// why it is not named with suffix _cb when it is callback for g_timeout_add?
+static gboolean update_icon(void *user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ if (applet->status_icon && applet->animation_stage <
ICON_STAGE_LAST)
+ {
+ gtk_status_icon_set_from_pixbuf(applet->status_icon,
+
applet->icon_stages_buff[applet->animation_stage++]);
+ }
+ if (applet->animation_stage == ICON_STAGE_LAST)
+ {
+ applet->animation_stage = 0;
+ }
+ if (--applet->anim_countdown == 0)
+ {
+ stop_animate_icon(applet);
+ }
+ return true;
+}
+
+static void animate_icon(struct applet* applet)
+{
+ if (applet->animator == 0)
+ {
+ applet->animator = g_timeout_add(100, update_icon, applet);
+ applet->anim_countdown = 10 * 3; /* 3 sec */
+ }
+}
+
static void on_notify_close(NotifyNotification *notification, gpointer user_data)
{
g_object_unref(notification);
@@ -126,6 +269,28 @@ static GtkWidget *create_menu(struct applet *applet)
return menu;
}
+static void on_applet_activate_cb(GtkStatusIcon *status_icon, gpointer user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ if (applet->daemon_running)
+ {
+ pid_t pid = vfork();
+ if (pid < 0)
+ perror_msg("vfork");
+ if (pid == 0)
+ { /* child */
+ signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
+ execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
+ /* Did not find abrt-gui in installation directory. Oh well */
+ /* Trying to find it in PATH */
+ execlp("abrt-gui", "abrt-gui", (char*) NULL);
+ perror_msg_and_die("Can't execute abrt-gui");
+ }
+ gtk_status_icon_set_visible(applet->status_icon, false);
+ stop_animate_icon(applet);
+ }
+}
+
struct applet *applet_new(const char* app_name)
{
struct applet *applet = (struct applet*)xmalloc(sizeof(struct applet));
@@ -181,65 +346,6 @@ void set_icon_tooltip(struct applet *applet, const char *format,
...)
free(buf);
}
-void action_report(NotifyNotification *notification, gchar *action, gpointer user_data)
-{
- struct applet *applet = (struct applet *)user_data;
- if (applet->daemon_running)
- {
- pid_t pid = vfork();
- if (pid < 0)
- perror_msg("vfork");
- if (pid == 0)
- { /* child */
- char *buf = xasprintf("--report=%s", applet->last_crash_id);
- signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
- execl(BIN_DIR"/abrt-gui", "abrt-gui", buf, (char*)
NULL);
- /* Did not find abrt-gui in installation directory. Oh well */
- /* Trying to find it in PATH */
- execlp("abrt-gui", "abrt-gui", buf, (char*) NULL);
- perror_msg_and_die("Can't execute abrt-gui");
- }
- GError *err = NULL;
- notify_notification_close(notification, &err);
- if (err != NULL)
- {
- error_msg("%s", err->message);
- g_error_free(err);
- }
- gtk_status_icon_set_visible(applet->status_icon, false);
- stop_animate_icon(applet);
- }
-}
-
-void action_open_gui(NotifyNotification *notification, gchar *action, gpointer
user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- if (applet->daemon_running)
- {
- pid_t pid = vfork();
- if (pid < 0)
- perror_msg("vfork");
- if (pid == 0)
- { /* child */
- signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
- execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
- /* Did not find abrt-gui in installation directory. Oh well */
- /* Trying to find it in PATH */
- execlp("abrt-gui", "abrt-gui", (char*) NULL);
- perror_msg_and_die("Can't execute abrt-gui");
- }
- GError *err = NULL;
- notify_notification_close(notification, &err);
- if (err != NULL)
- {
- error_msg("%s", err->message);
- g_error_free(err);
- }
- gtk_status_icon_set_visible(applet->status_icon, false);
- stop_animate_icon(applet);
- }
-}
-
void crash_notify(struct applet *applet, const char* crash_id, const char *format, ...)
{
applet->last_crash_id = crash_id;
@@ -294,46 +400,6 @@ void message_notify(struct applet *applet, const char *format, ...)
}
}
-void on_applet_activate_cb(GtkStatusIcon *status_icon, gpointer user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- if (applet->daemon_running)
- {
- pid_t pid = vfork();
- if (pid < 0)
- perror_msg("vfork");
- if (pid == 0)
- { /* child */
- signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
- execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
- /* Did not find abrt-gui in installation directory. Oh well */
- /* Trying to find it in PATH */
- execlp("abrt-gui", "abrt-gui", (char*) NULL);
- perror_msg_and_die("Can't execute abrt-gui");
- }
- gtk_status_icon_set_visible(applet->status_icon, false);
- stop_animate_icon(applet);
- }
-}
-
-void on_menu_popup_cb(GtkStatusIcon *status_icon,
- guint button,
- guint activate_time,
- gpointer user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- /* stop the animation */
- stop_animate_icon(applet);
-
- if (applet->menu != NULL)
- {
- gtk_menu_popup(GTK_MENU(applet->menu),
- NULL, NULL,
- gtk_status_icon_position_menu,
- status_icon, button, activate_time);
- }
-}
-
void show_icon(struct applet *applet)
{
gtk_status_icon_set_visible(applet->status_icon, true);
@@ -379,71 +445,6 @@ void enable(struct applet *applet, const char *reason)
show_icon(applet);
}
-// why it is not named with suffix _cb when it is callback for g_timeout_add?
-gboolean update_icon(void *user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- if (applet->status_icon && applet->animation_stage <
ICON_STAGE_LAST)
- {
- gtk_status_icon_set_from_pixbuf(applet->status_icon,
-
applet->icon_stages_buff[applet->animation_stage++]);
- }
- if (applet->animation_stage == ICON_STAGE_LAST)
- {
- applet->animation_stage = 0;
- }
- if (--applet->anim_countdown == 0)
- {
- stop_animate_icon(applet);
- }
- return true;
-}
-
-void animate_icon(struct applet* applet)
-{
- if (applet->animator == 0)
- {
- applet->animator = g_timeout_add(100, update_icon, applet);
- applet->anim_countdown = 10 * 3; /* 3 sec */
- }
-}
-
-void stop_animate_icon(struct applet *applet)
-{
- /* animator should be 0 if icons are not loaded, so this should be safe */
- if (applet->animator != 0)
- {
- g_source_remove(applet->animator);
- gtk_status_icon_set_from_pixbuf(applet->status_icon,
- applet->icon_stages_buff[ICON_DEFAULT]
- );
- applet->animator = 0;
- }
-}
-
-bool load_icons(struct applet *applet)
-{
- //FIXME: just a tmp workaround
- return false;
- int stage;
- for (stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++)
- {
- char name[sizeof(ICON_DIR"/abrt%02d.png")];
- GError *error = NULL;
- if (snprintf(name, sizeof(ICON_DIR"/abrt%02d.png"),
ICON_DIR"/abrt%02d.png", stage) > 0)
- {
- applet->icon_stages_buff[stage] = gdk_pixbuf_new_from_file(name,
&error);
- if (error != NULL)
- {
- error_msg("Can't load pixbuf from %s, animation is
disabled", name);
- return false;
- }
- }
- }
- return true;
-}
-
-
//int CApplet::AddEvent(int pUUID, const char *pProgname)
//{
// m_mapEvents[pUUID] = "pProgname";
diff --git a/src/applet/CCApplet.h b/src/applet/CCApplet.h
index a7fb543..f1949f3 100644
--- a/src/applet/CCApplet.h
+++ b/src/applet/CCApplet.h
@@ -72,19 +72,4 @@ 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 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 on_menu_popup_cb(GtkStatusIcon *status_icon,
- guint button,
- guint activate_time,
- gpointer user_data);
-gboolean update_icon(void *data);
-void animate_icon(struct applet *applet);
-void stop_animate_icon(struct applet *applet);
-bool load_icons(struct applet *applet);
-
#endif
--
1.7.1
10:42 a.m.
New subject: [PATCH 4/7] make some function static
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/CCApplet.cpp | 329 ++++++++++++++++++++++++-----------------------
src/applet/CCApplet.h | 15 --
2 files changed, 165 insertions(+), 179 deletions(-)
Are you just moving the functions to another file and adding "static"
keyword, without changing the body? Then the patch looks ok.
Since by looking at the patch it's hard to tell, usually
it is stated in the patch description: "moving functions
around, no code changes in the bodies".
--
vda
10:45 a.m.
New subject: [PATCH 4/7] make some function static
On 08/27/2010 05:42 PM, Denys Vlasenko wrote:
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
> Signed-off-by: Nikola Pajkovsky<npajkovs(a)redhat.com>
> ---
> src/applet/CCApplet.cpp | 329 ++++++++++++++++++++++++-----------------------
> src/applet/CCApplet.h | 15 --
> 2 files changed, 165 insertions(+), 179 deletions(-)
Are you just moving the functions to another file and adding "static"
keyword, without changing the body? Then the patch looks ok.
Since by looking at the patch it's hard to tell, usually
it is stated in the patch description: "moving functions
around, no code changes in the bodies".
Yes, these functions were in class under `protected:` so I hide them.
10:05 a.m.
New subject: [PATCH 5/7] remove useless bracket
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/Applet.cpp | 5 +----
src/applet/CCApplet.cpp | 10 ++++------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp
index b00ae5f..f347592 100644
--- a/src/applet/Applet.cpp
+++ b/src/applet/Applet.cpp
@@ -56,9 +56,8 @@ static void Crash(DBusMessage* signal)
/* Optional 3rd param: uid */
const char* uid_str = NULL;
if (r == ABRT_DBUS_MORE_FIELDS)
- {
r = load_val(&in_iter, uid_str);
- }
+
if (r != ABRT_DBUS_LAST_FIELD)
{
error_msg("dbus signal %s: parameter type mismatch", __func__);
@@ -71,9 +70,7 @@ static void Crash(DBusMessage* signal)
errno = 0;
unsigned long uid_num = strtoul(uid_str, &end, 10);
if (errno || *end != '\0' || uid_num != getuid())
- {
return;
- }
}
const char* message = _("A crash in the %s package has been detected");
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
index 0e292bb..fa0d3f4 100644
--- a/src/applet/CCApplet.cpp
+++ b/src/applet/CCApplet.cpp
@@ -145,14 +145,13 @@ static gboolean update_icon(void *user_data)
gtk_status_icon_set_from_pixbuf(applet->status_icon,
applet->icon_stages_buff[applet->animation_stage++]);
}
+
if (applet->animation_stage == ICON_STAGE_LAST)
- {
applet->animation_stage = 0;
- }
+
if (--applet->anim_countdown == 0)
- {
stop_animate_icon(applet);
- }
+
return true;
}
@@ -306,9 +305,8 @@ struct applet *applet_new(const char* app_name)
applet->status_icon =
gtk_status_icon_new_from_pixbuf(applet->icon_stages_buff[ICON_DEFAULT]);
}
else
- {
applet->status_icon = gtk_status_icon_new_from_icon_name("abrt");
- }
+
notify_init(app_name);
gtk_status_icon_set_visible(applet->status_icon, FALSE);
--
1.7.1
10:46 a.m.
New subject: [PATCH 5/7] remove useless bracket
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/Applet.cpp | 5 +----
src/applet/CCApplet.cpp | 10 ++++------
2 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp
index b00ae5f..f347592 100644
--- a/src/applet/Applet.cpp
+++ b/src/applet/Applet.cpp
@@ -56,9 +56,8 @@ static void Crash(DBusMessage* signal)
/* Optional 3rd param: uid */
const char* uid_str = NULL;
if (r == ABRT_DBUS_MORE_FIELDS)
- {
r = load_val(&in_iter, uid_str);
- }
+
And when someone will need to add a second statement in the if() body,
he will need to add them again. I think bracket removal is not needed.
IMO, when they are added, they should stay.
(I personally like less wasteful style with one less line consumed:
if (expr) {
cmd;
}
which makes added {}'s eat only one line, not two,
but alas I am in minority here ;[ )
I tend to NAK this patch.
--
vda
10:57 a.m.
New subject: [PATCH 5/7] remove useless bracket
On 08/27/2010 05:46 PM, Denys Vlasenko wrote:
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
> Signed-off-by: Nikola Pajkovsky<npajkovs(a)redhat.com>
> ---
> src/applet/Applet.cpp | 5 +----
> src/applet/CCApplet.cpp | 10 ++++------
> 2 files changed, 5 insertions(+), 10 deletions(-)
>
> diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp
> index b00ae5f..f347592 100644
> --- a/src/applet/Applet.cpp
> +++ b/src/applet/Applet.cpp
> @@ -56,9 +56,8 @@ static void Crash(DBusMessage* signal)
> /* Optional 3rd param: uid */
> const char* uid_str = NULL;
> if (r == ABRT_DBUS_MORE_FIELDS)
> - {
> r = load_val(&in_iter, uid_str);
> - }
> +
And when someone will need to add a second statement in the if() body,
he will need to add them again. I think bracket removal is not needed.
IMO, when they are added, they should stay.
(I personally like less wasteful style with one less line consumed:
if (expr) {
cmd;
}
When I read more and more git source code, I'm starting more and more like
this notations, but I ready don't like use it for one cmd.
which makes added {}'s eat only one line, not two,
but alas I am in minority here ;[ )
I tend to NAK this patch.
10:05 a.m.
New subject: [PATCH 6/7] remove unused std::map and std::string
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/CCApplet.cpp | 13 -------------
src/applet/CCApplet.h | 5 -----
2 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
index fa0d3f4..aa9d12c 100644
--- a/src/applet/CCApplet.cpp
+++ b/src/applet/CCApplet.cpp
@@ -442,16 +442,3 @@ void enable(struct applet *applet, const char *reason)
gtk_status_icon_set_from_stock(applet->status_icon, GTK_STOCK_DIALOG_WARNING);
show_icon(applet);
}
-
-//int CApplet::AddEvent(int pUUID, const char *pProgname)
-//{
-// m_mapEvents[pUUID] = "pProgname";
-// SetIconTooltip(_("Pending events: %i"), m_mapEvents.size());
-// return 0;
-//}
-//
-//int CApplet::RemoveEvent(int pUUID)
-//{
-// m_mapEvents.erase(pUUID);
-// return 0;
-//}
diff --git a/src/applet/CCApplet.h b/src/applet/CCApplet.h
index f1949f3..c8f5da3 100644
--- a/src/applet/CCApplet.h
+++ b/src/applet/CCApplet.h
@@ -20,8 +20,6 @@
#define CC_APPLET_H_
#include <gtk/gtk.h>
-#include <map>
-#include <string>
#include <libnotify/notify.h>
enum ICON_STAGES
@@ -49,15 +47,12 @@ enum ICON_STAGES
struct applet {
GtkStatusIcon* status_icon;
GtkWidget *menu;
-
-// std::map<int, std::string> m_mapEvents;
bool daemon_running;
int animation_stage;
guint animator;
unsigned anim_countdown;
bool icons_loaded;
const char *last_crash_id;
-
GdkPixbuf *icon_stages_buff[ICON_STAGE_LAST];
};
--
1.7.1
10:46 a.m.
New subject: [PATCH 6/7] remove unused std::map and std::string
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/CCApplet.cpp | 13 -------------
src/applet/CCApplet.h | 5 -----
2 files changed, 0 insertions(+), 18 deletions(-)
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
index fa0d3f4..aa9d12c 100644
--- a/src/applet/CCApplet.cpp
+++ b/src/applet/CCApplet.cpp
@@ -442,16 +442,3 @@ void enable(struct applet *applet, const char *reason)
gtk_status_icon_set_from_stock(applet->status_icon, GTK_STOCK_DIALOG_WARNING);
show_icon(applet);
}
-
-//int CApplet::AddEvent(int pUUID, const char *pProgname)
-//{
-// m_mapEvents[pUUID] = "pProgname";
-// SetIconTooltip(_("Pending events: %i"), m_mapEvents.size());
-// return 0;
-//}
-//
-//int CApplet::RemoveEvent(int pUUID)
-//{
-// m_mapEvents.erase(pUUID);
-// return 0;
-//}
diff --git a/src/applet/CCApplet.h b/src/applet/CCApplet.h
index f1949f3..c8f5da3 100644
--- a/src/applet/CCApplet.h
+++ b/src/applet/CCApplet.h
@@ -20,8 +20,6 @@
#define CC_APPLET_H_
#include <gtk/gtk.h>
-#include <map>
-#include <string>
#include <libnotify/notify.h>
enum ICON_STAGES
@@ -49,15 +47,12 @@ enum ICON_STAGES
struct applet {
GtkStatusIcon* status_icon;
GtkWidget *menu;
-
-// std::map<int, std::string> m_mapEvents;
bool daemon_running;
int animation_stage;
guint animator;
unsigned anim_countdown;
bool icons_loaded;
const char *last_crash_id;
-
GdkPixbuf *icon_stages_buff[ICON_STAGE_LAST];
};
YES!
--
vda
10:05 a.m.
New subject: [PATCH 7/7] CCApplet.cpp -> applet_gtk.c
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/Applet.cpp | 2 +-
src/applet/CCApplet.cpp | 444 -----------------------------------------------
src/applet/CCApplet.h | 70 --------
src/applet/Makefile.am | 2 +-
src/applet/applet_gtk.c | 444 +++++++++++++++++++++++++++++++++++++++++++++++
src/applet/applet_gtk.h | 78 ++++++++
6 files changed, 524 insertions(+), 516 deletions(-)
delete mode 100644 src/applet/CCApplet.cpp
delete mode 100644 src/applet/CCApplet.h
create mode 100644 src/applet/applet_gtk.c
create mode 100644 src/applet/applet_gtk.h
diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp
index f347592..15647d2 100644
--- a/src/applet/Applet.cpp
+++ b/src/applet/Applet.cpp
@@ -28,7 +28,7 @@
#include "abrtlib.h"
#include "abrt_dbus.h"
#include "dbus_common.h"
-#include "CCApplet.h"
+#include "applet_gtk.h"
static struct applet* applet = NULL;
diff --git a/src/applet/CCApplet.cpp b/src/applet/CCApplet.cpp
deleted file mode 100644
index aa9d12c..0000000
--- a/src/applet/CCApplet.cpp
+++ /dev/null
@@ -1,444 +0,0 @@
-/*
- Copyright (C) 2009 Jiri Moskovcak (jmoskovc(a)redhat.com)
- Copyright (C) 2009 RedHat inc.
-
- 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.
-
- 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.
-
- 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.
-*/
-#if HAVE_CONFIG_H
-# include <config.h>
-#endif
-#include "abrtlib.h"
-#include "CCApplet.h"
-
-static bool load_icons(struct applet *applet)
-{
- //FIXME: just a tmp workaround
- return false;
- int stage;
- for (stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++)
- {
- char name[sizeof(ICON_DIR"/abrt%02d.png")];
- GError *error = NULL;
- if (snprintf(name, sizeof(ICON_DIR"/abrt%02d.png"),
ICON_DIR"/abrt%02d.png", stage) > 0)
- {
- applet->icon_stages_buff[stage] = gdk_pixbuf_new_from_file(name,
&error);
- if (error != NULL)
- {
- error_msg("Can't load pixbuf from %s, animation is
disabled", name);
- return false;
- }
- }
- }
- return true;
-}
-
-static void stop_animate_icon(struct applet *applet)
-{
- /* animator should be 0 if icons are not loaded, so this should be safe */
- if (applet->animator != 0)
- {
- g_source_remove(applet->animator);
- gtk_status_icon_set_from_pixbuf(applet->status_icon,
- applet->icon_stages_buff[ICON_DEFAULT]
- );
- applet->animator = 0;
- }
-}
-
-//this action should open the reporter dialog directly, without showing the main window
-static void action_report(NotifyNotification *notification, gchar *action, gpointer
user_data)
-{
- struct applet *applet = (struct applet *)user_data;
- if (applet->daemon_running)
- {
- pid_t pid = vfork();
- if (pid < 0)
- perror_msg("vfork");
- if (pid == 0)
- { /* child */
- char *buf = xasprintf("--report=%s", applet->last_crash_id);
- signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
- execl(BIN_DIR"/abrt-gui", "abrt-gui", buf, (char*)
NULL);
- /* Did not find abrt-gui in installation directory. Oh well */
- /* Trying to find it in PATH */
- execlp("abrt-gui", "abrt-gui", buf, (char*) NULL);
- perror_msg_and_die("Can't execute abrt-gui");
- }
- GError *err = NULL;
- notify_notification_close(notification, &err);
- if (err != NULL)
- {
- error_msg("%s", err->message);
- g_error_free(err);
- }
- gtk_status_icon_set_visible(applet->status_icon, false);
- stop_animate_icon(applet);
- }
-}
-
-//this action should open the main window
-static void action_open_gui(NotifyNotification *notification, gchar *action, gpointer
user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- if (applet->daemon_running)
- {
- pid_t pid = vfork();
- if (pid < 0)
- perror_msg("vfork");
- if (pid == 0)
- { /* child */
- signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
- execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
- /* Did not find abrt-gui in installation directory. Oh well */
- /* Trying to find it in PATH */
- execlp("abrt-gui", "abrt-gui", (char*) NULL);
- perror_msg_and_die("Can't execute abrt-gui");
- }
- GError *err = NULL;
- notify_notification_close(notification, &err);
- if (err != NULL)
- {
- error_msg("%s", err->message);
- g_error_free(err);
- }
- gtk_status_icon_set_visible(applet->status_icon, false);
- stop_animate_icon(applet);
- }
-}
-
-static void on_menu_popup_cb(GtkStatusIcon *status_icon,
- guint button,
- guint activate_time,
- gpointer user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- /* stop the animation */
- stop_animate_icon(applet);
-
- if (applet->menu != NULL)
- {
- gtk_menu_popup(GTK_MENU(applet->menu),
- NULL, NULL,
- gtk_status_icon_position_menu,
- status_icon, button, activate_time);
- }
-}
-
-// why it is not named with suffix _cb when it is callback for g_timeout_add?
-static gboolean update_icon(void *user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- if (applet->status_icon && applet->animation_stage <
ICON_STAGE_LAST)
- {
- gtk_status_icon_set_from_pixbuf(applet->status_icon,
-
applet->icon_stages_buff[applet->animation_stage++]);
- }
-
- if (applet->animation_stage == ICON_STAGE_LAST)
- applet->animation_stage = 0;
-
- if (--applet->anim_countdown == 0)
- stop_animate_icon(applet);
-
- return true;
-}
-
-static void animate_icon(struct applet* applet)
-{
- if (applet->animator == 0)
- {
- applet->animator = g_timeout_add(100, update_icon, applet);
- applet->anim_countdown = 10 * 3; /* 3 sec */
- }
-}
-
-static void on_notify_close(NotifyNotification *notification, gpointer user_data)
-{
- g_object_unref(notification);
-}
-
-static NotifyNotification *new_warn_notification()
-{
- NotifyNotification *notification;
- notification = notify_notification_new(_("Warning"), NULL, NULL, NULL);
- g_signal_connect(notification, "closed", G_CALLBACK(on_notify_close),
NULL);
-
- GdkPixbuf *pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
- GTK_STOCK_DIALOG_WARNING, 48, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
-
- if (pixbuf)
- notify_notification_set_icon_from_pixbuf(notification, pixbuf);
- notify_notification_set_urgency(notification, NOTIFY_URGENCY_NORMAL);
- notify_notification_set_timeout(notification, NOTIFY_EXPIRES_DEFAULT);
-
- return notification;
-}
-
-
-static void on_hide_cb(GtkMenuItem *menuitem, gpointer applet)
-{
- if (applet)
- hide_icon((struct applet*)applet);
-}
-
-static void on_about_cb(GtkMenuItem *menuitem, gpointer dialog)
-{
- if (dialog)
- {
- gtk_dialog_run(GTK_DIALOG(dialog));
- gtk_widget_hide(GTK_WIDGET(dialog));
- }
-}
-
-static GtkWidget *create_about_dialog()
-{
- const char *copyright_str = "Copyright © 2009 Red Hat, Inc\nCopyright © 2010 Red
Hat, Inc";
- const char *license_str = "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\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, see
<http://www.gnu.org/licenses/>.";
-
- const char *website_url = "https://fedorahosted.org/abrt/";
- const char *authors[] = {"Anton Arapov <aarapov(a)redhat.com>",
- "Karel Klic <kklic(a)redhat.com>",
- "Jiri Moskovcak <jmoskovc(a)redhat.com>",
- "Nikola Pajkovsky <npajkovs(a)redhat.com>",
- "Zdenek Prikryl <zprikryl(a)redhat.com>",
- "Denys Vlasenko <dvlasenk(a)redhat.com>",
- NULL};
-
- const char *artists[] = {"Patrick Connelly
<pcon(a)fedoraproject.org>",
- "Lapo Calamandrei",
- NULL};
-
- const char *comments = _("Notification area applet that notifies users about
"
- "issues detected by ABRT");
- GtkWidget *about_d = gtk_about_dialog_new();
- if (about_d)
- {
- gtk_window_set_default_icon_name("abrt");
- gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_d), VERSION);
- gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(about_d),
"abrt");
- gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about_d), comments);
- gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about_d), "ABRT");
- gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about_d), copyright_str);
- gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_d), license_str);
- gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(about_d),true);
- gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about_d), website_url);
- gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about_d), authors);
- gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(about_d), artists);
- gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(about_d),
_("translator-credits"));
- }
- return about_d;
-}
-
-static GtkWidget *create_menu(struct applet *applet)
-{
- GtkWidget *menu = gtk_menu_new();
- GtkWidget *b_quit = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
- g_signal_connect(b_quit, "activate", gtk_main_quit, NULL);
- GtkWidget *b_hide = gtk_menu_item_new_with_label(_("Hide"));
- g_signal_connect(b_hide, "activate", G_CALLBACK(on_hide_cb), applet);
- GtkWidget *b_about = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL);
- GtkWidget *about_dialog = create_about_dialog();
- g_signal_connect(b_about, "activate", G_CALLBACK(on_about_cb),
about_dialog);
- GtkWidget *separator = gtk_separator_menu_item_new();
- if (menu)
- {
- gtk_menu_shell_append(GTK_MENU_SHELL(menu),b_hide);
- gtk_widget_show(b_hide);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu),b_about);
- gtk_widget_show(b_about);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu),separator);
- gtk_widget_show(separator);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu),b_quit);
- gtk_widget_show(b_quit);
- }
- return menu;
-}
-
-static void on_applet_activate_cb(GtkStatusIcon *status_icon, gpointer user_data)
-{
- struct applet *applet = (struct applet*)user_data;
- if (applet->daemon_running)
- {
- pid_t pid = vfork();
- if (pid < 0)
- perror_msg("vfork");
- if (pid == 0)
- { /* child */
- signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
- execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
- /* Did not find abrt-gui in installation directory. Oh well */
- /* Trying to find it in PATH */
- execlp("abrt-gui", "abrt-gui", (char*) NULL);
- perror_msg_and_die("Can't execute abrt-gui");
- }
- gtk_status_icon_set_visible(applet->status_icon, false);
- stop_animate_icon(applet);
- }
-}
-
-struct applet *applet_new(const char* app_name)
-{
- struct applet *applet = (struct applet*)xmalloc(sizeof(struct applet));
- applet->daemon_running = true;
- /* set-up icon buffers */
- applet->animator = 0;
- applet->animation_stage = ICON_DEFAULT;
- applet->icons_loaded = load_icons(applet);
- /* - animation - */
- if (applet->icons_loaded == true)
- {
- //FIXME: animation is disabled for now
- applet->status_icon =
gtk_status_icon_new_from_pixbuf(applet->icon_stages_buff[ICON_DEFAULT]);
- }
- else
- applet->status_icon = gtk_status_icon_new_from_icon_name("abrt");
-
- notify_init(app_name);
-
- gtk_status_icon_set_visible(applet->status_icon, FALSE);
-
- 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());
-
- applet->menu = create_menu(applet);
- return applet;
-}
-
-void applet_destroy(struct applet *applet)
-{
- if (notify_is_initted())
- notify_uninit();
-
- free(applet);
-}
-
-void set_icon_tooltip(struct applet *applet, const char *format, ...)
-{
- va_list args;
- int n;
- char *buf;
-
- // xvasprintf?
- va_start(args, format);
- buf = NULL;
- n = vasprintf(&buf, format, args);
- va_end(args);
-
- gtk_status_icon_set_tooltip_text(applet->status_icon, (n >= 0 && buf) ?
buf : "");
- free(buf);
-}
-
-void crash_notify(struct applet *applet, const char* crash_id, const char *format, ...)
-{
- applet->last_crash_id = crash_id;
- va_list args;
- va_start(args, format);
- char *buf = xvasprintf(format, args);
- va_end(args);
-
- NotifyNotification *notification = new_warn_notification();
- notify_notification_add_action(notification, "REPORT",
_("Report"),
- NOTIFY_ACTION_CALLBACK(action_report),
- applet, NULL);
- notify_notification_add_action(notification, "OPEN_MAIN_WINDOW",
_("Open ABRT"),
- NOTIFY_ACTION_CALLBACK(action_open_gui),
- applet, NULL);
-
- notify_notification_update(notification, _("Warning"), buf, NULL);
- free(buf);
- GError *err = NULL;
- notify_notification_show(notification, &err);
- if (err != NULL)
- {
- error_msg("%s", err->message);
- g_error_free(err);
- }
-}
-
-void message_notify(struct applet *applet, const char *format, ...)
-{
- va_list args;
-
- va_start(args, format);
- char *buf = xvasprintf(format, args);
- va_end(args);
-
- /* we don't want to show any buttons now,
- maybe later we can add action binded to message
- like >>Clear old dumps<< for quota exceeded
- */
- NotifyNotification *notification = new_warn_notification();
- notify_notification_add_action(notification, "OPEN_MAIN_WINDOW",
_("Open ABRT"),
- NOTIFY_ACTION_CALLBACK(action_open_gui),
- applet, NULL);
- notify_notification_update(notification, _("Warning"), buf, NULL);
- free(buf);
- GError *err = NULL;
- notify_notification_show(notification, &err);
- if (err != NULL)
- {
- error_msg("%s", err->message);
- g_error_free(err);
- }
-}
-
-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 */
- if (applet->icons_loaded)
- animate_icon(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)
-{
- /*
- FIXME: once we have our icon
- */
- applet->daemon_running = false;
- GdkPixbuf *gray_scaled;
- GdkPixbuf *pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
- GTK_STOCK_DIALOG_WARNING, 24, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
- if (pixbuf)
- {
- gray_scaled = gdk_pixbuf_copy(pixbuf);
- gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, false);
- gtk_status_icon_set_from_pixbuf(applet->status_icon, gray_scaled);
-//do we need to free pixbufs nere?
- }
- else
- error_msg("Can't load icon");
- set_icon_tooltip(applet, reason);
- show_icon(applet);
-}
-
-void enable(struct applet *applet, const char *reason)
-{
- /* restore the original icon */
- applet->daemon_running = true;
- set_icon_tooltip(applet, reason);
- gtk_status_icon_set_from_stock(applet->status_icon, GTK_STOCK_DIALOG_WARNING);
- show_icon(applet);
-}
diff --git a/src/applet/CCApplet.h b/src/applet/CCApplet.h
deleted file mode 100644
index c8f5da3..0000000
--- a/src/applet/CCApplet.h
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- Copyright (C) 2009 Jiri Moskovcak (jmoskovc(a)redhat.com)
- Copyright (C) 2009 RedHat inc.
-
- 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.
-
- 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.
-
- 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.
-*/
-#ifndef CC_APPLET_H_
-#define CC_APPLET_H_
-
-#include <gtk/gtk.h>
-#include <libnotify/notify.h>
-
-enum ICON_STAGES
-{
- ICON_DEFAULT,
- ICON_STAGE1,
- ICON_STAGE2,
- ICON_STAGE3,
- ICON_STAGE4,
- ICON_STAGE5,
- /* this must be always the last */
- ICON_STAGE_LAST
-};
-
-/*
- * What is better name for struct?
- *
- * typedef struct _applet {
- * ...
- * } applet_t;
- *
- * or
- */
-
-struct applet {
- GtkStatusIcon* status_icon;
- GtkWidget *menu;
- bool daemon_running;
- int animation_stage;
- guint animator;
- unsigned anim_countdown;
- bool icons_loaded;
- const char *last_crash_id;
- GdkPixbuf *icon_stages_buff[ICON_STAGE_LAST];
-};
-
-struct applet* applet_new(const char *app_name);
-void applet_destroy(struct applet *applet);
-
-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);
-
-#endif
diff --git a/src/applet/Makefile.am b/src/applet/Makefile.am
index 743c18d..55e2873 100644
--- a/src/applet/Makefile.am
+++ b/src/applet/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = abrt-applet
abrt_applet_SOURCES = \
Applet.cpp \
- CCApplet.h CCApplet.cpp
+ applet_gtk.h applet_gtk.c
abrt_applet_CPPFLAGS = \
-Wall -Werror \
-I$(srcdir)/../../inc \
diff --git a/src/applet/applet_gtk.c b/src/applet/applet_gtk.c
new file mode 100644
index 0000000..cd8df4d
--- /dev/null
+++ b/src/applet/applet_gtk.c
@@ -0,0 +1,444 @@
+/*
+ Copyright (C) 2009 Jiri Moskovcak (jmoskovc(a)redhat.com)
+ Copyright (C) 2009 RedHat inc.
+
+ 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.
+
+ 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.
+
+ 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.
+*/
+#if HAVE_CONFIG_H
+# include <config.h>
+#endif
+#include "abrtlib.h"
+#include "applet_gtk.h"
+
+static bool load_icons(struct applet *applet)
+{
+ //FIXME: just a tmp workaround
+ return false;
+ int stage;
+ for (stage = ICON_DEFAULT; stage < ICON_STAGE_LAST; stage++)
+ {
+ char name[sizeof(ICON_DIR"/abrt%02d.png")];
+ GError *error = NULL;
+ if (snprintf(name, sizeof(ICON_DIR"/abrt%02d.png"),
ICON_DIR"/abrt%02d.png", stage) > 0)
+ {
+ applet->icon_stages_buff[stage] = gdk_pixbuf_new_from_file(name,
&error);
+ if (error != NULL)
+ {
+ error_msg("Can't load pixbuf from %s, animation is
disabled", name);
+ return false;
+ }
+ }
+ }
+ return true;
+}
+
+static void stop_animate_icon(struct applet *applet)
+{
+ /* animator should be 0 if icons are not loaded, so this should be safe */
+ if (applet->animator != 0)
+ {
+ g_source_remove(applet->animator);
+ gtk_status_icon_set_from_pixbuf(applet->status_icon,
+ applet->icon_stages_buff[ICON_DEFAULT]
+ );
+ applet->animator = 0;
+ }
+}
+
+//this action should open the reporter dialog directly, without showing the main window
+static void action_report(NotifyNotification *notification, gchar *action, gpointer
user_data)
+{
+ struct applet *applet = (struct applet *)user_data;
+ if (applet->daemon_running)
+ {
+ pid_t pid = vfork();
+ if (pid < 0)
+ perror_msg("vfork");
+ if (pid == 0)
+ { /* child */
+ char *buf = xasprintf("--report=%s", applet->last_crash_id);
+ signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
+ execl(BIN_DIR"/abrt-gui", "abrt-gui", buf, (char*)
NULL);
+ /* Did not find abrt-gui in installation directory. Oh well */
+ /* Trying to find it in PATH */
+ execlp("abrt-gui", "abrt-gui", buf, (char*) NULL);
+ perror_msg_and_die("Can't execute abrt-gui");
+ }
+ GError *err = NULL;
+ notify_notification_close(notification, &err);
+ if (err != NULL)
+ {
+ error_msg("%s", err->message);
+ g_error_free(err);
+ }
+ gtk_status_icon_set_visible(applet->status_icon, false);
+ stop_animate_icon(applet);
+ }
+}
+
+//this action should open the main window
+static void action_open_gui(NotifyNotification *notification, gchar *action, gpointer
user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ if (applet->daemon_running)
+ {
+ pid_t pid = vfork();
+ if (pid < 0)
+ perror_msg("vfork");
+ if (pid == 0)
+ { /* child */
+ signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
+ execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
+ /* Did not find abrt-gui in installation directory. Oh well */
+ /* Trying to find it in PATH */
+ execlp("abrt-gui", "abrt-gui", (char*) NULL);
+ perror_msg_and_die("Can't execute abrt-gui");
+ }
+ GError *err = NULL;
+ notify_notification_close(notification, &err);
+ if (err != NULL)
+ {
+ error_msg("%s", err->message);
+ g_error_free(err);
+ }
+ gtk_status_icon_set_visible(applet->status_icon, false);
+ stop_animate_icon(applet);
+ }
+}
+
+static void on_menu_popup_cb(GtkStatusIcon *status_icon,
+ guint button,
+ guint activate_time,
+ gpointer user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ /* stop the animation */
+ stop_animate_icon(applet);
+
+ if (applet->menu != NULL)
+ {
+ gtk_menu_popup(GTK_MENU(applet->menu),
+ NULL, NULL,
+ gtk_status_icon_position_menu,
+ status_icon, button, activate_time);
+ }
+}
+
+// why it is not named with suffix _cb when it is callback for g_timeout_add?
+static gboolean update_icon(void *user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ if (applet->status_icon && applet->animation_stage <
ICON_STAGE_LAST)
+ {
+ gtk_status_icon_set_from_pixbuf(applet->status_icon,
+
applet->icon_stages_buff[applet->animation_stage++]);
+ }
+
+ if (applet->animation_stage == ICON_STAGE_LAST)
+ applet->animation_stage = 0;
+
+ if (--applet->anim_countdown == 0)
+ stop_animate_icon(applet);
+
+ return true;
+}
+
+static void animate_icon(struct applet* applet)
+{
+ if (applet->animator == 0)
+ {
+ applet->animator = g_timeout_add(100, update_icon, applet);
+ applet->anim_countdown = 10 * 3; /* 3 sec */
+ }
+}
+
+static void on_notify_close(NotifyNotification *notification, gpointer user_data)
+{
+ g_object_unref(notification);
+}
+
+static NotifyNotification *new_warn_notification()
+{
+ NotifyNotification *notification;
+ notification = notify_notification_new(_("Warning"), NULL, NULL, NULL);
+ g_signal_connect(notification, "closed", G_CALLBACK(on_notify_close),
NULL);
+
+ GdkPixbuf *pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
+ GTK_STOCK_DIALOG_WARNING, 48, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+
+ if (pixbuf)
+ notify_notification_set_icon_from_pixbuf(notification, pixbuf);
+ notify_notification_set_urgency(notification, NOTIFY_URGENCY_NORMAL);
+ notify_notification_set_timeout(notification, NOTIFY_EXPIRES_DEFAULT);
+
+ return notification;
+}
+
+
+static void on_hide_cb(GtkMenuItem *menuitem, gpointer applet)
+{
+ if (applet)
+ hide_icon((struct applet*)applet);
+}
+
+static void on_about_cb(GtkMenuItem *menuitem, gpointer dialog)
+{
+ if (dialog)
+ {
+ gtk_dialog_run(GTK_DIALOG(dialog));
+ gtk_widget_hide(GTK_WIDGET(dialog));
+ }
+}
+
+static GtkWidget *create_about_dialog()
+{
+ const char *copyright_str = "Copyright © 2009 Red Hat, Inc\nCopyright © 2010 Red
Hat, Inc";
+ const char *license_str = "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\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, see
<http://www.gnu.org/licenses/>.";
+
+ const char *website_url = "https://fedorahosted.org/abrt/";
+ const char *authors[] = {"Anton Arapov <aarapov(a)redhat.com>",
+ "Karel Klic <kklic(a)redhat.com>",
+ "Jiri Moskovcak <jmoskovc(a)redhat.com>",
+ "Nikola Pajkovsky <npajkovs(a)redhat.com>",
+ "Zdenek Prikryl <zprikryl(a)redhat.com>",
+ "Denys Vlasenko <dvlasenk(a)redhat.com>",
+ NULL};
+
+ const char *artists[] = {"Patrick Connelly
<pcon(a)fedoraproject.org>",
+ "Lapo Calamandrei",
+ NULL};
+
+ const char *comments = _("Notification area applet that notifies users about
"
+ "issues detected by ABRT");
+ GtkWidget *about_d = gtk_about_dialog_new();
+ if (about_d)
+ {
+ gtk_window_set_default_icon_name("abrt");
+ gtk_about_dialog_set_version(GTK_ABOUT_DIALOG(about_d), VERSION);
+ gtk_about_dialog_set_logo_icon_name(GTK_ABOUT_DIALOG(about_d),
"abrt");
+ gtk_about_dialog_set_comments(GTK_ABOUT_DIALOG(about_d), comments);
+ gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(about_d), "ABRT");
+ gtk_about_dialog_set_copyright(GTK_ABOUT_DIALOG(about_d), copyright_str);
+ gtk_about_dialog_set_license(GTK_ABOUT_DIALOG(about_d), license_str);
+ gtk_about_dialog_set_wrap_license(GTK_ABOUT_DIALOG(about_d),true);
+ gtk_about_dialog_set_website(GTK_ABOUT_DIALOG(about_d), website_url);
+ gtk_about_dialog_set_authors(GTK_ABOUT_DIALOG(about_d), authors);
+ gtk_about_dialog_set_artists(GTK_ABOUT_DIALOG(about_d), artists);
+ gtk_about_dialog_set_translator_credits(GTK_ABOUT_DIALOG(about_d),
_("translator-credits"));
+ }
+ return about_d;
+}
+
+static GtkWidget *create_menu(struct applet *applet)
+{
+ GtkWidget *menu = gtk_menu_new();
+ GtkWidget *b_quit = gtk_image_menu_item_new_from_stock(GTK_STOCK_QUIT, NULL);
+ g_signal_connect(b_quit, "activate", gtk_main_quit, NULL);
+ GtkWidget *b_hide = gtk_menu_item_new_with_label(_("Hide"));
+ g_signal_connect(b_hide, "activate", G_CALLBACK(on_hide_cb), applet);
+ GtkWidget *b_about = gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, NULL);
+ GtkWidget *about_dialog = create_about_dialog();
+ g_signal_connect(b_about, "activate", G_CALLBACK(on_about_cb),
about_dialog);
+ GtkWidget *separator = gtk_separator_menu_item_new();
+ if (menu)
+ {
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu),b_hide);
+ gtk_widget_show(b_hide);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu),b_about);
+ gtk_widget_show(b_about);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu),separator);
+ gtk_widget_show(separator);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu),b_quit);
+ gtk_widget_show(b_quit);
+ }
+ return menu;
+}
+
+static void on_applet_activate_cb(GtkStatusIcon *status_icon, gpointer user_data)
+{
+ struct applet *applet = (struct applet*)user_data;
+ if (applet->daemon_running)
+ {
+ pid_t pid = vfork();
+ if (pid < 0)
+ perror_msg("vfork");
+ if (pid == 0)
+ { /* child */
+ signal(SIGCHLD, SIG_DFL); /* undo SIG_IGN in abrt-applet */
+ execl(BIN_DIR"/abrt-gui", "abrt-gui", (char*) NULL);
+ /* Did not find abrt-gui in installation directory. Oh well */
+ /* Trying to find it in PATH */
+ execlp("abrt-gui", "abrt-gui", (char*) NULL);
+ perror_msg_and_die("Can't execute abrt-gui");
+ }
+ gtk_status_icon_set_visible(applet->status_icon, false);
+ stop_animate_icon(applet);
+ }
+}
+
+struct applet *applet_new(const char* app_name)
+{
+ struct applet *applet = (struct applet*)xmalloc(sizeof(struct applet));
+ applet->daemon_running = true;
+ /* set-up icon buffers */
+ applet->animator = 0;
+ applet->animation_stage = ICON_DEFAULT;
+ applet->icons_loaded = load_icons(applet);
+ /* - animation - */
+ if (applet->icons_loaded == true)
+ {
+ //FIXME: animation is disabled for now
+ applet->status_icon =
gtk_status_icon_new_from_pixbuf(applet->icon_stages_buff[ICON_DEFAULT]);
+ }
+ else
+ applet->status_icon = gtk_status_icon_new_from_icon_name("abrt");
+
+ notify_init(app_name);
+
+ gtk_status_icon_set_visible(applet->status_icon, FALSE);
+
+ 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());
+
+ applet->menu = create_menu(applet);
+ return applet;
+}
+
+void applet_destroy(struct applet *applet)
+{
+ if (notify_is_initted())
+ notify_uninit();
+
+ free(applet);
+}
+
+void set_icon_tooltip(struct applet *applet, const char *format, ...)
+{
+ va_list args;
+ int n;
+ char *buf;
+
+ // xvasprintf?
+ va_start(args, format);
+ buf = NULL;
+ n = vasprintf(&buf, format, args);
+ va_end(args);
+
+ gtk_status_icon_set_tooltip_text(applet->status_icon, (n >= 0 && buf) ?
buf : "");
+ free(buf);
+}
+
+void crash_notify(struct applet *applet, const char* crash_id, const char *format, ...)
+{
+ applet->last_crash_id = crash_id;
+ va_list args;
+ va_start(args, format);
+ char *buf = xvasprintf(format, args);
+ va_end(args);
+
+ NotifyNotification *notification = new_warn_notification();
+ notify_notification_add_action(notification, "REPORT",
_("Report"),
+ NOTIFY_ACTION_CALLBACK(action_report),
+ applet, NULL);
+ notify_notification_add_action(notification, "OPEN_MAIN_WINDOW",
_("Open ABRT"),
+ NOTIFY_ACTION_CALLBACK(action_open_gui),
+ applet, NULL);
+
+ notify_notification_update(notification, _("Warning"), buf, NULL);
+ free(buf);
+ GError *err = NULL;
+ notify_notification_show(notification, &err);
+ if (err != NULL)
+ {
+ error_msg("%s", err->message);
+ g_error_free(err);
+ }
+}
+
+void message_notify(struct applet *applet, const char *format, ...)
+{
+ va_list args;
+
+ va_start(args, format);
+ char *buf = xvasprintf(format, args);
+ va_end(args);
+
+ /* we don't want to show any buttons now,
+ maybe later we can add action binded to message
+ like >>Clear old dumps<< for quota exceeded
+ */
+ NotifyNotification *notification = new_warn_notification();
+ notify_notification_add_action(notification, "OPEN_MAIN_WINDOW",
_("Open ABRT"),
+ NOTIFY_ACTION_CALLBACK(action_open_gui),
+ applet, NULL);
+ notify_notification_update(notification, _("Warning"), buf, NULL);
+ free(buf);
+ GError *err = NULL;
+ notify_notification_show(notification, &err);
+ if (err != NULL)
+ {
+ error_msg("%s", err->message);
+ g_error_free(err);
+ }
+}
+
+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 */
+ if (applet->icons_loaded)
+ animate_icon(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)
+{
+ /*
+ FIXME: once we have our icon
+ */
+ applet->daemon_running = false;
+ GdkPixbuf *gray_scaled;
+ GdkPixbuf *pixbuf = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(),
+ GTK_STOCK_DIALOG_WARNING, 24, GTK_ICON_LOOKUP_USE_BUILTIN, NULL);
+ if (pixbuf)
+ {
+ gray_scaled = gdk_pixbuf_copy(pixbuf);
+ gdk_pixbuf_saturate_and_pixelate(pixbuf, gray_scaled, 0.0, false);
+ gtk_status_icon_set_from_pixbuf(applet->status_icon, gray_scaled);
+//do we need to free pixbufs nere?
+ }
+ else
+ error_msg("Can't load icon");
+ set_icon_tooltip(applet, reason);
+ show_icon(applet);
+}
+
+void enable(struct applet *applet, const char *reason)
+{
+ /* restore the original icon */
+ applet->daemon_running = true;
+ set_icon_tooltip(applet, reason);
+ gtk_status_icon_set_from_stock(applet->status_icon, GTK_STOCK_DIALOG_WARNING);
+ show_icon(applet);
+}
diff --git a/src/applet/applet_gtk.h b/src/applet/applet_gtk.h
new file mode 100644
index 0000000..22e9c2a
--- /dev/null
+++ b/src/applet/applet_gtk.h
@@ -0,0 +1,78 @@
+/*
+ Copyright (C) 2009 Jiri Moskovcak (jmoskovc(a)redhat.com)
+ Copyright (C) 2009 RedHat inc.
+
+ 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.
+
+ 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.
+
+ 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.
+*/
+#ifndef CC_APPLET_H_
+#define CC_APPLET_H_
+
+#include <gtk/gtk.h>
+#include <libnotify/notify.h>
+
+enum ICON_STAGES
+{
+ ICON_DEFAULT,
+ ICON_STAGE1,
+ ICON_STAGE2,
+ ICON_STAGE3,
+ ICON_STAGE4,
+ ICON_STAGE5,
+ /* this must be always the last */
+ ICON_STAGE_LAST
+};
+
+/*
+ * What is better name for struct?
+ *
+ * typedef struct _applet {
+ * ...
+ * } applet_t;
+ *
+ * or
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+struct applet {
+ GtkStatusIcon* status_icon;
+ GtkWidget *menu;
+ bool daemon_running;
+ int animation_stage;
+ guint animator;
+ unsigned anim_countdown;
+ bool icons_loaded;
+ const char *last_crash_id;
+ GdkPixbuf *icon_stages_buff[ICON_STAGE_LAST];
+};
+
+struct applet* applet_new(const char *app_name);
+void applet_destroy(struct applet *applet);
+
+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);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--
1.7.1
10:47 a.m.
New subject: [PATCH 7/7] CCApplet.cpp -> applet_gtk.c
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/Applet.cpp | 2 +-
src/applet/CCApplet.cpp | 444 -----------------------------------------------
src/applet/CCApplet.h | 70 --------
src/applet/Makefile.am | 2 +-
src/applet/applet_gtk.c | 444 +++++++++++++++++++++++++++++++++++++++++++++++
src/applet/applet_gtk.h | 78 ++++++++
6 files changed, 524 insertions(+), 516 deletions(-)
delete mode 100644 src/applet/CCApplet.cpp
delete mode 100644 src/applet/CCApplet.h
create mode 100644 src/applet/applet_gtk.c
create mode 100644 src/applet/applet_gtk.h
diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp
index f347592..15647d2 100644
--- a/src/applet/Applet.cpp
+++ b/src/applet/Applet.cpp
@@ -28,7 +28,7 @@
#include "abrtlib.h"
#include "abrt_dbus.h"
#include "dbus_common.h"
-#include "CCApplet.h"
+#include "applet_gtk.h"
Ok.
--
vda
10:21 a.m.
New subject: [PATCH 8/8] fix potfiles after renaming applet_gtk.cpp -> applet_gtk.c
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
po/POTFILES.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 932ff86..4f0bb7a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,7 @@ lib/utils/make_descr.cpp
lib/utils/abrt_curl.c
src/applet/abrt-applet.desktop.in
src/applet/Applet.cpp
-src/applet/CCApplet.cpp
+src/applet/applet_gtk.c
src/cli/CLI.cpp
src/cli/report.cpp
src/daemon/CommLayerServerDBus.cpp
--
1.7.1
10:52 a.m.
New subject: [PATCH 8/8] fix potfiles after renaming applet_gtk.cpp -> applet_gtk.c
On Fri, 2010-08-27 at 17:21 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
po/POTFILES.in | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 932ff86..4f0bb7a 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -26,7 +26,7 @@ lib/utils/make_descr.cpp
lib/utils/abrt_curl.c
src/applet/abrt-applet.desktop.in
src/applet/Applet.cpp
-src/applet/CCApplet.cpp
+src/applet/applet_gtk.c
src/cli/CLI.cpp
src/cli/report.cpp
src/daemon/CommLayerServerDBus.cpp
Looks ok to me.
--
vda
10:22 a.m.
On Fri, 2010-08-27 at 17:05 +0200, Nikola Pajkovsky wrote:
Signed-off-by: Nikola Pajkovsky <npajkovs(a)redhat.com>
---
src/applet/Applet.cpp | 18 +++---
src/applet/CCApplet.cpp | 154 +++++++++++++++++++++++++----------------------
src/applet/CCApplet.h | 110 +++++++++++++++++----------------
3 files changed, 146 insertions(+), 136 deletions(-)
Looks ok to me.
+/*
+ * What is better name for struct?
+ *
+ * typedef struct _applet {
+ * ...
+ * } applet_t;
+ *
+ * or
+ */
I don't see any reason to use "struct _applet".
_names with underscores are reserved for compiler and libc,
it's better to avoid them.
I've seen this style:
typedef struct foo {
...
} foo;
which makes both "foo" and "struct foo" the same (a-la C++).
Other common practice is to add _t suffix to names
which refer to types:
typedef struct foo {
...
} foo_t;
I like both of these styles.
--
vda
5009
days inactive
5012
days old
crash-catcher@lists.fedorahosted.org
20 comments
2 participants
participants (2)
-
Denys Vlasenko -
Nikola Pajkovsky