From af62f5f9fc31a8b24a56983d37cad2d29380ff20 Mon Sep 17 00:00:00 2001
From: Jiri Moskovcak <jmoskovc@redhat.com>
Date: Fri, 4 Nov 2011 15:28:15 +0100
Subject: [PATCH 2/2] gtk3 build fixes

---
 configure.ac        |    7 ++++++-
 src/applet/applet.c |    4 ++--
 src/gui-gtk/main.c  |    7 ++++++-
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6b0732c..d584047 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=abrt
 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/applet/applet.c b/src/applet/applet.c
index 4ff73b6..95b7091 100644
--- a/src/applet/applet.c
+++ b/src/applet/applet.c
@@ -581,8 +581,8 @@ static void init_applet(void)
             ap_status_icon = gtk_status_icon_new_from_icon_name("abrt");
         }
         hide_icon();
-        g_signal_connect(G_OBJECT(ap_status_icon), "activate", GTK_SIGNAL_FUNC(on_applet_activate_cb), NULL);
-        g_signal_connect(G_OBJECT(ap_status_icon), "popup_menu", GTK_SIGNAL_FUNC(on_menu_popup_cb), NULL);
+        g_signal_connect(G_OBJECT(ap_status_icon), "activate", G_CALLBACK(on_applet_activate_cb), NULL);
+        g_signal_connect(G_OBJECT(ap_status_icon), "popup_menu", G_CALLBACK(on_menu_popup_cb), NULL);
         ap_menu = create_menu();
     }
 
diff --git a/src/gui-gtk/main.c b/src/gui-gtk/main.c
index a8aacec..b31509b 100644
--- a/src/gui-gtk/main.c
+++ b/src/gui-gtk/main.c
@@ -25,6 +25,11 @@
 #include <internal_libreport_gtk.h>
 #include "libabrt.h"
 
+#if GTK_MAJOR_VERSION == 2 && GTK_MINOR_VERSION < 22
+# define GDK_KEY_Delete GDK_Delete
+# define GDK_KEY_KP_Delete GDK_KP_Delete
+#endif
+
 static void scan_dirs_and_add_to_dirlist(void);
 
 
@@ -460,7 +465,7 @@ static gint on_key_press_event_cb(GtkTreeView *treeview, GdkEventKey *key, gpoin
 {
     int k = key->keyval;
 
-    if (k == GDK_Delete || k == GDK_KP_Delete)
+    if (k == GDK_KEY_Delete || k == GDK_KEY_KP_Delete)
     {
         delete_report(treeview);
         return TRUE;
-- 
1.7.7