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