GTK3 fixes:

- Replace 2 cases where GtkObject was used (no longer exists in GTK3)
- Whenever gdkkeysyms.h is included also include gdkkeysyms-compat.h
  iff we are building against gtk3

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@37722 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/gtk/color_edit_dlg.c b/gtk/color_edit_dlg.c
index 34920575309e965af105d5fa918cf3a83c151b07..14f56a7d16c47d58558025758fb87f5df47774f8 100644 (file)
--- a/gtk/color_edit_dlg.c
+++ b/gtk/color_edit_dlg.c
@@ -62,7 +62,7 @@ static void edit_new_color_filter_cancel_cb(GtkButton *button, gpointer user_dat
 
 static GtkWidget* color_sel_win_new(color_filter_t *colorf, gboolean);
 static void color_sel_ok_cb(GtkButton *button, gpointer user_data);
-static void color_sel_cancel_cb(GtkObject *object, gpointer user_data);
+static void color_sel_cancel_cb(GObject *object, gpointer user_data);
 
 
 #define COLOR_FILTERS_CL        "color_filters_cl"
@@ -613,7 +613,7 @@ color_sel_ok_cb                        (GtkButton       *button _U_,
 /* Don't choose the selected color as the foreground or background
    color for the filter. */
 static void
-color_sel_cancel_cb                    (GtkObject       *object _U_,
+color_sel_cancel_cb                    (GObject        *object _U_,
                                         gpointer         user_data)
 {
   GtkWidget *color_dialog;

diff --git a/gtk/decode_as_dlg.c b/gtk/decode_as_dlg.c
index a5eb2e713757e65b397fa9a41546013965eb1b63..198a0935ba847c5804a77b853e49e9f246330cbe 100644 (file)
--- a/gtk/decode_as_dlg.c
+++ b/gtk/decode_as_dlg.c
@@ -29,6 +29,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/packet.h>
 #include <epan/epan_dissect.h>

diff --git a/gtk/export_sslkeys.c b/gtk/export_sslkeys.c
index ec6c44d8f71103a5919f60370e919d6f4bdc5a90..2c8e490286175514bf0a8073db20f4e4a88e0a80 100644 (file)
--- a/gtk/export_sslkeys.c
+++ b/gtk/export_sslkeys.c
@@ -42,6 +42,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 #include <wsutil/file_util.h>
 
 #include <string.h>

diff --git a/gtk/filter_autocomplete.c b/gtk/filter_autocomplete.c
index 40f9859af021621224a4c4573732ddcb690c49fa..147832d3ce7ff87d56697a62d3f1d08086ca74e2 100644 (file)
--- a/gtk/filter_autocomplete.c
+++ b/gtk/filter_autocomplete.c
@@ -35,6 +35,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/proto.h>
 

diff --git a/gtk/graph_analysis.c b/gtk/graph_analysis.c
index ff229363202cae2d9d9b1caae813df84f0eb9888..4d2a3b7f445d1efb0cfe2b685cde5f421495af6d 100644 (file)
--- a/gtk/graph_analysis.c
+++ b/gtk/graph_analysis.c
@@ -41,6 +41,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/epan_dissect.h>
 #include <epan/tap.h>

diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 8b14e4c4b18a8b34323c6e480bb786a17a9262b4..f9dc27f2f85d99cfdc0e4e12f4acb1bcc754a557 100644 (file)
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -33,6 +33,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/prefs.h>
 #include "epan/epan.h"

diff --git a/gtk/main.c b/gtk/main.c
index 7a5922efc1569af92344dee7bb05cbe9282cf518..4808a28562a8aba0b541fd18d174c3a8ad2e27ca 100644 (file)
--- a/gtk/main.c
+++ b/gtk/main.c
@@ -32,6 +32,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <stdio.h>
 #include <string.h>

diff --git a/gtk/main_proto_draw.c b/gtk/main_proto_draw.c
index b8a043f2305961c6e0e8e1696791b9adf9de7332..8eebdfec4cd75fd5faeaf21244c2bd348477fd9f 100644 (file)
--- a/gtk/main_proto_draw.c
+++ b/gtk/main_proto_draw.c
@@ -41,6 +41,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <string.h>
 

diff --git a/gtk/packet_win.c b/gtk/packet_win.c
index 0c5c85c63e83a39c2f7be2744f05d674f9b5b236..19da2fe1fc722711d5311721b33dcb9ba3406604 100644 (file)
--- a/gtk/packet_win.c
+++ b/gtk/packet_win.c
@@ -41,6 +41,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <string.h>
 

diff --git a/gtk/profile_dlg.c b/gtk/profile_dlg.c
index 8a6b24d59e145385c9e10f4bd9bef941ebad4507..e496ad61c5c5e0315a4845e6b43eef4b107263f3 100644 (file)
--- a/gtk/profile_dlg.c
+++ b/gtk/profile_dlg.c
@@ -31,6 +31,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/filesystem.h>
 #include <epan/prefs.h>

diff --git a/gtk/proto_dlg.c b/gtk/proto_dlg.c
index 25b5cbb5261d08c64adcd0de1d3a531ff864ee97..dd0e7ada0d70c739259f20e4524bf53642462392 100644 (file)
--- a/gtk/proto_dlg.c
+++ b/gtk/proto_dlg.c
@@ -30,6 +30,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/prefs.h>
 #include <epan/filesystem.h>

diff --git a/gtk/tcp_graph.c b/gtk/tcp_graph.c
index a02360338e4412778908ae1dbaddfd2f3e8e7d87..d48a312fd6f25ebc8db7a6a89097f45d9f21b0a1 100644 (file)
--- a/gtk/tcp_graph.c
+++ b/gtk/tcp_graph.c
@@ -34,6 +34,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/packet.h>
 #include <epan/ipproto.h>

diff --git a/gtk/uat_gui.c b/gtk/uat_gui.c
index 41eba6a009e84c7df3bf27d43e89f4765f7b1888..da6faeb925a2262bae05f12f848a21533a55f095 100644 (file)
--- a/gtk/uat_gui.c
+++ b/gtk/uat_gui.c
@@ -46,6 +46,9 @@
 
 #include <gtk/gtk.h>
 #include <gdk/gdkkeysyms.h>
+#if GTK_CHECK_VERSION(3,0,0)
+# include <gdk/gdkkeysyms-compat.h>
+#endif
 
 #include <epan/dfilter/dfilter-macro.h>
 #include <epan/emem.h>