summaryrefslogtreecommitdiff
path: root/src/themes
diff options
context:
space:
mode:
authorinfirit <[email protected]>2014-07-03 17:08:09 +0200
committerinfirit <[email protected]>2014-07-03 17:49:01 +0200
commit0ca03319bc1a69638f76c914fb6b86d142e88829 (patch)
treefa4aece5de1e58edbc75c8cccdcb9209d40a1b4f /src/themes
parent3689698d12b93355a273e1aae1936ff9a74defd1 (diff)
downloadmate-notification-daemon-0ca03319bc1a69638f76c914fb6b86d142e88829.tar.bz2
mate-notification-daemon-0ca03319bc1a69638f76c914fb6b86d142e88829.tar.xz
Use g_object_unref in callback for both Gtk+ versions
Diffstat (limited to 'src/themes')
-rw-r--r--src/themes/coco/coco-theme.c4
-rw-r--r--src/themes/nodoka/nodoka-theme.c4
-rw-r--r--src/themes/standard/theme.c8
3 files changed, 0 insertions, 16 deletions
diff --git a/src/themes/coco/coco-theme.c b/src/themes/coco/coco-theme.c
index 3d13f14..606101c 100644
--- a/src/themes/coco/coco-theme.c
+++ b/src/themes/coco/coco-theme.c
@@ -643,11 +643,7 @@ clear_notification_actions(GtkWindow *nw)
gtk_widget_hide(windata->actions_box);
gtk_container_foreach(GTK_CONTAINER(windata->actions_box),
-#if GTK_CHECK_VERSION (3, 0, 0)
(GtkCallback)g_object_unref, NULL);
-#else
- (GtkCallback)gtk_object_destroy, NULL);
-#endif
}
/* Move notification window */
diff --git a/src/themes/nodoka/nodoka-theme.c b/src/themes/nodoka/nodoka-theme.c
index 906cdd6..cf9f70d 100644
--- a/src/themes/nodoka/nodoka-theme.c
+++ b/src/themes/nodoka/nodoka-theme.c
@@ -1038,11 +1038,7 @@ clear_notification_actions(GtkWindow *nw)
gtk_widget_hide(windata->actions_box);
gtk_container_foreach(GTK_CONTAINER(windata->actions_box),
-#if GTK_CHECK_VERSION(3, 0, 0)
(GtkCallback)g_object_unref, NULL);
-#else
- (GtkCallback)gtk_object_destroy, NULL);
-#endif
}
/* Move notification window */
diff --git a/src/themes/standard/theme.c b/src/themes/standard/theme.c
index 3c52a92..f68d2b9 100644
--- a/src/themes/standard/theme.c
+++ b/src/themes/standard/theme.c
@@ -734,11 +734,7 @@ GtkWindow* create_notification(UrlClickedCb url_clicked)
gtk_button_set_relief(GTK_BUTTON(close_button), GTK_RELIEF_NONE);
gtk_container_set_border_width(GTK_CONTAINER(close_button), 0);
//gtk_widget_set_size_request(close_button, 20, 20);
-#if GTK_CHECK_VERSION(3, 0, 0)
g_signal_connect_swapped(G_OBJECT(close_button), "clicked", G_CALLBACK(g_object_unref), win);
-#else
- g_signal_connect_swapped(G_OBJECT(close_button), "clicked", G_CALLBACK(gtk_widget_destroy), win);
-#endif
rcstyle = gtk_rc_style_new();
rcstyle->xthickness = rcstyle->ythickness = 0;
@@ -1051,11 +1047,7 @@ void clear_notification_actions(GtkWindow* nw)
windata->pie_countdown = NULL;
gtk_widget_hide(windata->actions_box);
-#if GTK_CHECK_VERSION(3, 0, 0)
gtk_container_foreach(GTK_CONTAINER(windata->actions_box), (GtkCallback) g_object_unref, NULL);
-#else
- gtk_container_foreach(GTK_CONTAINER(windata->actions_box), (GtkCallback) gtk_object_destroy, NULL);
-#endif
}
void move_notification(GtkWidget* nw, int x, int y)