aboutsummaryrefslogtreecommitdiffstats
path: root/e-util/e-alert-dialog.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2013-09-08 00:31:19 +0800
committerMatthew Barnes <mbarnes@redhat.com>2013-09-08 07:08:54 +0800
commit3da4948c0fc1f2c21b163f0ec456b2d99c881258 (patch)
tree479d6153d31e03cb7a65990683b5271402e5ec29 /e-util/e-alert-dialog.c
parent2e5031cb4538b4819e5fce5d717668c3445df80a (diff)
downloadgsoc2013-evolution-3da4948c0fc1f2c21b163f0ec456b2d99c881258.tar
gsoc2013-evolution-3da4948c0fc1f2c21b163f0ec456b2d99c881258.tar.gz
gsoc2013-evolution-3da4948c0fc1f2c21b163f0ec456b2d99c881258.tar.bz2
gsoc2013-evolution-3da4948c0fc1f2c21b163f0ec456b2d99c881258.tar.lz
gsoc2013-evolution-3da4948c0fc1f2c21b163f0ec456b2d99c881258.tar.xz
gsoc2013-evolution-3da4948c0fc1f2c21b163f0ec456b2d99c881258.tar.zst
gsoc2013-evolution-3da4948c0fc1f2c21b163f0ec456b2d99c881258.zip
Miscellaneous cleanups.
Diffstat (limited to 'e-util/e-alert-dialog.c')
-rw-r--r--e-util/e-alert-dialog.c14
1 files changed, 8 insertions, 6 deletions
diff --git a/e-util/e-alert-dialog.c b/e-util/e-alert-dialog.c
index 8b495c17db..2803687ea4 100644
--- a/e-util/e-alert-dialog.c
+++ b/e-util/e-alert-dialog.c
@@ -160,7 +160,8 @@ alert_dialog_constructed (GObject *object)
if (!actions) {
GtkAction *action;
- /* Make sure there is at least one action, thus the dialog can be closed. */
+ /* Make sure there is at least one action,
+ * thus the dialog can be closed. */
action = gtk_action_new (
"alert-response-0", _("_Dismiss"), NULL, NULL);
e_alert_add_action (alert, action, GTK_RESPONSE_CLOSE);
@@ -344,19 +345,20 @@ e_alert_run_dialog (GtkWindow *parent,
dialog = e_alert_dialog_new (parent, alert);
- if (parent) {
+ if (parent != NULL) {
gtk_window_set_urgency_hint (parent, TRUE);
- signal_id = g_signal_connect (dialog, "focus-in-event", G_CALLBACK (dialog_focus_in_event_cb), parent);
+ signal_id = g_signal_connect (
+ dialog, "focus-in-event",
+ G_CALLBACK (dialog_focus_in_event_cb), parent);
} else {
gtk_window_set_urgency_hint (GTK_WINDOW (dialog), TRUE);
}
response = gtk_dialog_run (GTK_DIALOG (dialog));
- if (parent) {
+ if (signal_id > 0) {
gtk_window_set_urgency_hint (parent, FALSE);
- if (signal_id)
- g_signal_handler_disconnect (dialog, signal_id);
+ g_signal_handler_disconnect (dialog, signal_id);
}
gtk_widget_destroy (dialog);