aboutsummaryrefslogtreecommitdiff
path: root/src/ka-applet.c
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2010-06-19 15:28:04 +0200
committerGuido Günther <agx@sigxcpu.org>2010-06-19 15:28:04 +0200
commit3dabd41cdb58f4575dd81e6668a7cba6337ca09c (patch)
treeb70234f94d6c99481f3dac90635337ca32053017 /src/ka-applet.c
parentDon't only match even release numbers (diff)
parentImported Upstream version 0.16~rc2 (diff)
downloadkrb5-auth-dialog-3dabd41cdb58f4575dd81e6668a7cba6337ca09c.tar.gz
krb5-auth-dialog-3dabd41cdb58f4575dd81e6668a7cba6337ca09c.tar.bz2
krb5-auth-dialog-3dabd41cdb58f4575dd81e6668a7cba6337ca09c.zip
Merge commit 'upstream/0.16.rc2' into experimental
Diffstat (limited to 'src/ka-applet.c')
-rw-r--r--src/ka-applet.c17
1 files changed, 13 insertions, 4 deletions
diff --git a/src/ka-applet.c b/src/ka-applet.c
index 472f4f5..bce4288 100644
--- a/src/ka-applet.c
+++ b/src/ka-applet.c
@@ -463,7 +463,8 @@ ka_send_event_notification (KaApplet *applet,
const char *icon,
const char *action)
{
- const char *notify_icon;
+ const char *notify_icon;
+ GError *error = NULL;
g_return_if_fail (applet != NULL);
g_return_if_fail (summary != NULL);
@@ -473,8 +474,16 @@ ka_send_event_notification (KaApplet *applet,
notify_init (PACKAGE);
if (applet->priv->notification != NULL) {
- notify_notification_close (applet->priv->notification, NULL);
+ if (!notify_notification_close (applet->priv->notification,
+ &error)) {
+ if (error)
+ g_warning ("Cannot close notification %s",
+ error->message);
+ else
+ g_warning ("Cannot close notification");
+ }
g_object_unref (applet->priv->notification);
+ g_clear_error (&error);
}
notify_icon = icon ? icon : "krb-valid-ticket";
@@ -620,7 +629,7 @@ ka_applet_cb_preferences (GtkWidget* menuitem G_GNUC_UNUSED,
G_CALLBACK (gtk_widget_destroy),
NULL);
gtk_widget_show (message_dialog);
- g_error_free (error);
+ g_clear_error (&error);
}
}
@@ -661,7 +670,7 @@ ka_about_dialog_url_hook (GtkAboutDialog *about,
G_CALLBACK (gtk_widget_destroy),
NULL);
gtk_widget_show (message_dialog);
- g_error_free (error);
+ g_clear_error (&error);
}
}
bgstack15