>From 187020377198d14cdffc0a729b9db866d4206b78 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Thu, 27 Oct 2011 12:59:54 +0200 Subject: [PATCH] fixed compilation with gtk3 --- configure.ac | 7 ++++++- src/gui-wizard-gtk/wizard.c | 14 +++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index c0eecf0..c6e8914 100644 --- a/configure.ac +++ b/configure.ac @@ -20,6 +20,11 @@ AC_ARG_ENABLE(debug, [Enable debug information])], [CFLAGS="$CFLAGS -DDEBUG -ggdb -g"]) +AC_ARG_ENABLE(gtk3, + [AC_HELP_STRING([--enable-gtk3], + [Use gtk3 instead of gtk2])], + [GTK_VER="gtk+-3.0"],[GTK_VER="gtk+-2.0"]) + dnl ****** INTERNATIONALIZATION ********************** GETTEXT_PACKAGE=libreport AC_SUBST(GETTEXT_PACKAGE) @@ -56,7 +61,7 @@ AC_PATH_PROG([XMLTO], [xmlto], [no]) [exit 1] [fi] -PKG_CHECK_MODULES([GTK], [gtk+-2.0]) +PKG_CHECK_MODULES([GTK], [$GTK_VER]) PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.21]) PKG_CHECK_MODULES([DBUS], [dbus-1]) PKG_CHECK_MODULES([LIBXML], [libxml-2.0]) diff --git a/src/gui-wizard-gtk/wizard.c b/src/gui-wizard-gtk/wizard.c index 74e867e..0b02bd6 100644 --- a/src/gui-wizard-gtk/wizard.c +++ b/src/gui-wizard-gtk/wizard.c @@ -1431,7 +1431,11 @@ static gboolean consume_cmd_output(GIOChannel *source, GIOCondition condition, g GtkWidget *vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *textbox = gtk_entry_new(); - gtk_entry_set_editable(GTK_ENTRY(textbox), TRUE); + /* gtk_entry_set_editable(GTK_ENTRY(textbox), TRUE); + * is not available in gtk3, so please use the highlevel + * g_object_set + */ + g_object_set(G_OBJECT(textbox), "editable", TRUE, NULL); gtk_box_pack_start(GTK_BOX(vbox), textbox, TRUE, TRUE, 0); gtk_widget_show(textbox); if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_OK) @@ -1463,7 +1467,11 @@ static gboolean consume_cmd_output(GIOChannel *source, GIOCondition condition, g GtkWidget *vbox = gtk_dialog_get_content_area(GTK_DIALOG(dialog)); GtkWidget *textbox = gtk_entry_new(); - gtk_entry_set_editable(GTK_ENTRY(textbox), TRUE); + /* gtk_entry_set_editable(GTK_ENTRY(textbox), TRUE); + * is not available in gtk3, so please use the highlevel + * g_object_set + */ + g_object_set(G_OBJECT(textbox), "editable", TRUE, NULL); gtk_entry_set_visibility(GTK_ENTRY(textbox), FALSE); gtk_box_pack_start(GTK_BOX(vbox), textbox, TRUE, TRUE, 0); gtk_widget_show(textbox); @@ -2365,7 +2373,7 @@ static gint on_key_press_event_in_item_list(GtkTreeView *treeview, GdkEventKey * { int k = key->keyval; - if (k == GDK_Delete || k == GDK_KP_Delete) + if (k == GDK_KEY_Delete || k == GDK_KEY_KP_Delete) { delete_item(treeview); return TRUE; -- 1.7.7