From 21f119060181898a20ef0d2c766277e6de49d673 Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Fri, 27 Aug 2010 15:50:51 +0200 Subject: get rid of CApplet class Signed-off-by: Nikola Pajkovsky Acked-off-by: Denys Vlasenko --- src/applet/Applet.cpp | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/applet/Applet.cpp') diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp index be9c662d..2f35cab5 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; } -- cgit From 896c9b5ab9d3daf2c3254da5b9eb022a01e5c19d Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Fri, 27 Aug 2010 16:03:06 +0200 Subject: lower case variable in struct applet Signed-off-by: Nikola Pajkovsky Acked-off-by: Denys Vlasenko --- src/applet/Applet.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/applet/Applet.cpp') diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp index 2f35cab5..239f7a04 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); + show_crash_notification(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); + show_msg_notification(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) -- cgit From daeb21ab2819d1581979311faa87c45e17dacd03 Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Fri, 27 Aug 2010 17:03:56 +0200 Subject: CCApplet.cpp -> applet_gtk.c Signed-off-by: Nikola Pajkovsky Acked-off-by: Denys Vlasenko --- src/applet/Applet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/applet/Applet.cpp') diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp index 239f7a04..7529e854 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; -- cgit From d781199df58b5cb6561a0ce0e04f4e54359c5fb5 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 30 Aug 2010 16:43:37 +0200 Subject: abrt_dbus: preparatory patch for C++ -> c conversion Signed-off-by: Denys Vlasenko --- src/applet/Applet.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/applet/Applet.cpp') diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp index 7529e854..b83c3d2c 100644 --- a/src/applet/Applet.cpp +++ b/src/applet/Applet.cpp @@ -242,7 +242,7 @@ int main(int argc, char** argv) dbus_error_init(&err); DBusConnection* system_conn = dbus_bus_get(DBUS_BUS_SYSTEM, &err); die_if_dbus_error(system_conn == NULL, &err, "Can't connect to system dbus"); - attach_dbus_conn_to_glib_main_loop(system_conn); + attach_dbus_conn_to_glib_main_loop(system_conn, NULL, NULL); if (!dbus_connection_add_filter(system_conn, handle_message, NULL, NULL)) error_msg_and_die("Can't add dbus filter"); /* which messages do we want to be fed to handle_message()? */ -- cgit From bd71db9397fbf2fa585ada04bce151e800801c73 Mon Sep 17 00:00:00 2001 From: Denys Vlasenko Date: Mon, 30 Aug 2010 16:56:03 +0200 Subject: consolidate HAVE_CONFIG_H in abrtlib.h Signed-off-by: Denys Vlasenko --- src/applet/Applet.cpp | 3 --- 1 file changed, 3 deletions(-) (limited to 'src/applet/Applet.cpp') diff --git a/src/applet/Applet.cpp b/src/applet/Applet.cpp index b83c3d2c..cc29fbde 100644 --- a/src/applet/Applet.cpp +++ b/src/applet/Applet.cpp @@ -16,9 +16,6 @@ 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 -#endif #if HAVE_LOCALE_H # include #endif -- cgit