make compiling with -DGTK_DISABLE_DEPRECATED work

svn path=/trunk/; revision=38004

4 files changed, 8 insertions, 4 deletions

diff --git a/gtk/conversations_table.c b/gtk/conversations_table.c
index 7ef808d225..a54beac33c 100644
--- a/gtk/conversations_table.c
+++ b/gtk/conversations_table.c
@@ -2586,7 +2586,7 @@ init_conversation_table(gboolean hide_ports, const char *table_name, const char
 
 
 static void
-ct_nb_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpointer data)
+ct_nb_switch_page_cb(GtkNotebook *nb, gpointer *pg _U_, guint page, gpointer data)
 {
     GtkWidget *copy_bt = (GtkWidget *) data;
     GtkWidget *follow_stream_bt = g_object_get_data(G_OBJECT(nb), FOLLOW_STREAM_BT_KEY);
diff --git a/gtk/dlg_utils.c b/gtk/dlg_utils.c
index 2bcc7e85bc..1f9cc89a77 100644
--- a/gtk/dlg_utils.c
+++ b/gtk/dlg_utils.c
@@ -273,7 +273,11 @@ dlg_button_row_new(const gchar *stock_id_first, ...)
     /* do we have a map button? -> special handling for it */
     if (map) {
         button = gtk_button_new_from_stock(map);
+#if GTK_CHECK_VERSION(2,18,0)
+        gtk_widget_set_can_default(button, TRUE);
+#else
         GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT);
+#endif
         g_object_set_data(G_OBJECT(hbox), map, button);
         gtk_box_pack_start(GTK_BOX(help_hbox), button, FALSE, FALSE, 0);
         gtk_widget_show(button);
diff --git a/gtk/gui_utils.c b/gtk/gui_utils.c
index 234d8b6ba8..938db35c7c 100644
--- a/gtk/gui_utils.c
+++ b/gtk/gui_utils.c
@@ -1125,7 +1125,7 @@ void simple_list_url_col(GtkWidget *list, gint col)
     /* make the column look like a link ... */
     ul_column = gtk_tree_view_get_column(GTK_TREE_VIEW(list), col);
 
-    renderers_list = gtk_tree_view_column_get_cell_renderers(ul_column);
+    renderers_list = gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(ul_column));
 
     if(renderers_list != NULL) {
         /* it is simple list - there should be only one renderer */
diff --git a/gtk/hostlist_table.c b/gtk/hostlist_table.c
index 5078e8beb4..902f444a69 100644
--- a/gtk/hostlist_table.c
+++ b/gtk/hostlist_table.c
@@ -1406,7 +1406,7 @@ init_hostlist_table(gboolean hide_ports, const char *table_name, const char *tap
 
 
 static void
-ct_nb_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpointer data)
+ct_nb_switch_page_cb(GtkNotebook *nb, gpointer *pg _U_, guint page, gpointer data)
 {
     GtkWidget *copy_bt = (GtkWidget *) data;
     void ** pages = g_object_get_data(G_OBJECT(nb), NB_PAGES_KEY);
@@ -1420,7 +1420,7 @@ ct_nb_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpoin
 
 #ifdef HAVE_GEOIP
 static void
-ct_nb_map_switch_page_cb(GtkNotebook *nb, GtkNotebookPage *pg _U_, guint page, gpointer data)
+ct_nb_map_switch_page_cb(GtkNotebook *nb, gpointer *pg _U_, guint page, gpointer data)
 {
     GtkWidget *map_bt = (GtkWidget *) data;
     void ** pages = g_object_get_data(G_OBJECT(nb), NB_PAGES_KEY);