summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2011-02-18 01:04:30 +0100
committerLennart Poettering <lennart@poettering.net>2011-02-18 01:04:30 +0100
commit60df0a8aef01c52a1fead39b1063e654717f73e7 (patch)
tree671620afa513dc9f15cc4736569748f9d04bf600
parent4329d03bca8936fe3b3f697f4e9108b591b7a7fe (diff)
gtk3: skip gtk_quit_add() for now
gtk3 removed gtk_quit_add() without replacement. We need this functionality however. But for now comment this and complain. https://bugzilla.gnome.org/show_bug.cgi?id=639770
-rw-r--r--src/canberra-gtk-module.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/canberra-gtk-module.c b/src/canberra-gtk-module.c
index 90c583a..63f9465 100644
--- a/src/canberra-gtk-module.c
+++ b/src/canberra-gtk-module.c
@@ -932,10 +932,14 @@ static void connect_settings(void) {
connected = TRUE;
}
+#if GTK_CHECK_VERSION(3,0,0)
+#warning "We really need a quit handler in Gtk 3.0, https://bugzilla.gnome.org/show_bug.cgi?id=639770"
+#else
static gboolean quit_handler(gpointer data) {
dispatch_queue();
return FALSE;
}
+#endif
G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
@@ -964,7 +968,9 @@ G_MODULE_EXPORT void gtk_module_init(gint *argc, gchar ***argv[]) {
install_hook(GTK_TYPE_WIDGET, "drag-failed", &signal_id_widget_drag_failed);
install_hook(GTK_TYPE_EXPANDER, "activate", &signal_id_expander_activate);
+#if !GTK_CHECK_VERSION(3,0,0)
gtk_quit_add(1, quit_handler, NULL);
+#endif
}
G_MODULE_EXPORT gchar* g_module_check_init(GModule *module);