GTK+ 2.17.11 is now the required version

I've used all the GTK+ 2.17.11 api available, still missing:

GTK_WIDGET_REALIZED (GTK_WIDGET ())
GTK_WIDGET_MAPPED (GTK_WIDGET ())
GTK_ENTRY->im_context
GTK_STATUSBAR->frame
GTK_STATUSBAR->label
GTK_MESSAGE_DIALOG->label

https://bugzilla.gnome.org/show_bug.cgi?id=595791

Signed-off-by: Xan Lopez <xan@gnome.org>

6 files changed, 28 insertions, 18 deletions

diff --git a/src/bookmarks/ephy-bookmark-action.c b/src/bookmarks/ephy-bookmark-action.c
index fd70b2904..90af3b1fd 100644
--- a/src/bookmarks/ephy-bookmark-action.c
+++ b/src/bookmarks/ephy-bookmark-action.c
@@ -463,7 +463,8 @@ drag_data_get_cb (GtkWidget          *widget,
 
 	g_return_if_fail (location != NULL);
 
-	gtk_selection_data_set (selection_data, selection_data->target, 8, (unsigned char *)location, strlen (location));
+	gtk_selection_data_set (selection_data, gtk_selection_data_get_target (selection_data),
+				8, (unsigned char *)location, strlen (location));
 }
 
 static void
@@ -593,7 +594,7 @@ connect_proxy (GtkAction *action,
 	{
 		GtkLabel *label;
 
-		label = (GtkLabel *) ((GtkBin *) proxy)->child;
+		label = GTK_LABEL (gtk_bin_get_child (GTK_BIN (proxy)));
 
 		gtk_label_set_use_underline (label, FALSE);
 		gtk_label_set_ellipsize (label, PANGO_ELLIPSIZE_END);
diff --git a/src/bookmarks/ephy-bookmark-factory-action.c b/src/bookmarks/ephy-bookmark-factory-action.c
index 51c165f57..4a17cf5df 100644
--- a/src/bookmarks/ephy-bookmark-factory-action.c
+++ b/src/bookmarks/ephy-bookmark-factory-action.c
@@ -57,7 +57,7 @@ activate_item_cb (GtkWidget *menuitem, GtkWidget *placeholder)
 	g_return_if_fail (model);
 	
 	children = gtk_container_get_children (GTK_CONTAINER (etoolbar));
-	pos = g_list_index (children, toolbar->parent);
+	pos = g_list_index (children, gtk_widget_get_parent (toolbar));
 	index = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (item));
 	g_list_free (children);
 	
@@ -186,7 +186,7 @@ remove_placeholder_cb (GtkMenuShell *menushell,
 	g_object_set_data (G_OBJECT (model), EGG_TOOLBARS_MODEL_DATA, NULL);
 
 	children = gtk_container_get_children (GTK_CONTAINER (etoolbar));
-	pos = g_list_index (children, toolbar->parent);
+	pos = g_list_index (children, gtk_widget_get_parent (toolbar));
 	index = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (item));
 	g_list_free (children);
 	
diff --git a/src/bookmarks/ephy-bookmark-properties.c b/src/bookmarks/ephy-bookmark-properties.c
index 83174506f..ed8f9b2cd 100644
--- a/src/bookmarks/ephy-bookmark-properties.c
+++ b/src/bookmarks/ephy-bookmark-properties.c
@@ -489,6 +489,7 @@ ephy_bookmark_properties_constructor (GType type,
 	EphyBookmarkProperties *properties;
 	EphyBookmarkPropertiesPrivate *priv;
 	GtkWidget *widget, *table, *label, *entry, *container;
+	GtkWidget *content_area, *action_area;
 	GtkWindow *window;
 	GtkDialog *dialog;
 	gboolean lockdown;
@@ -526,10 +527,11 @@ ephy_bookmark_properties_constructor (GType type,
 	lockdown = eel_gconf_get_boolean (CONF_LOCKDOWN_DISABLE_BOOKMARK_EDITING);
 
 	update_window_title (properties);
+	content_area = gtk_dialog_get_content_area (dialog);
 
 	gtk_dialog_set_has_separator (dialog, FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (properties), 5);
-	gtk_box_set_spacing (GTK_BOX (dialog->vbox), 2);
+	gtk_box_set_spacing (GTK_BOX (content_area), 2);
 
 	table = gtk_table_new (4, 2, FALSE);
 	gtk_table_set_row_spacings (GTK_TABLE (table), 6);
@@ -604,7 +606,7 @@ ephy_bookmark_properties_constructor (GType type,
 	gtk_widget_show (widget);
 	gtk_table_attach (GTK_TABLE (table), widget, 1, 2, 3, 4, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 0);
 	
-	gtk_box_pack_start (GTK_BOX (dialog->vbox), table, TRUE, TRUE, 0); 
+	gtk_box_pack_start (GTK_BOX (content_area), table, TRUE, TRUE, 0);
 	
 	priv->warning = gtk_toggle_button_new ();
 	gtk_button_set_focus_on_click (GTK_BUTTON (priv->warning), FALSE);
@@ -627,11 +629,13 @@ ephy_bookmark_properties_constructor (GType type,
 	gtk_dialog_add_button (dialog,
 			       GTK_STOCK_HELP,
 			       GTK_RESPONSE_HELP);
+
+	action_area = gtk_dialog_get_action_area (dialog);
 	
-	gtk_box_pack_end (GTK_BOX (dialog->action_area), 
+	gtk_box_pack_end (GTK_BOX (action_area),
 			  priv->warning, FALSE, TRUE, 0);
-	gtk_button_box_set_child_secondary
-	  (GTK_BUTTON_BOX (dialog->action_area), priv->warning, TRUE);
+	gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (action_area),
+					    priv->warning, TRUE);
 	
 	if (priv->creating)
 	{
diff --git a/src/bookmarks/ephy-bookmarks-editor.c b/src/bookmarks/ephy-bookmarks-editor.c
index 0feceed09..ea5c37f7a 100644
--- a/src/bookmarks/ephy-bookmarks-editor.c
+++ b/src/bookmarks/ephy-bookmarks-editor.c
@@ -402,7 +402,8 @@ delete_topic_dialog_construct (GtkWindow *parent,
 	gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Delete Topic"), GTK_RESPONSE_ACCEPT);
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
 
-	gtk_window_group_add_window (GTK_WINDOW (parent)->group, GTK_WINDOW (dialog));
+	gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (parent)),
+				     GTK_WINDOW (dialog));
 
 	return dialog;
 }
@@ -685,7 +686,7 @@ import_bookmarks (EphyBookmarksEditor *editor,
 			   "unsupported type."),
 			 basename);
 
-		gtk_window_group_add_window (GTK_WINDOW (editor)->group,
+		gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (editor)),
 					     GTK_WINDOW (dialog));
 
 		gtk_dialog_run (GTK_DIALOG (dialog));
@@ -922,7 +923,8 @@ cmd_bookmarks_export (GtkAction *action,
 	
 	gtk_file_chooser_set_extra_widget (GTK_FILE_CHOOSER (dialog), hbox);
 
-	gtk_window_group_add_window (GTK_WINDOW (editor)->group, GTK_WINDOW (dialog));
+	gtk_window_group_add_window (gtk_window_get_group (GTK_WINDOW (editor)),
+				     GTK_WINDOW (dialog));
 
 	g_signal_connect (dialog, "response",
 			  G_CALLBACK (export_dialog_response_cb), editor);
@@ -934,6 +936,7 @@ cmd_bookmarks_import (GtkAction *action,
 		      EphyBookmarksEditor *editor)
 {
 	GtkWidget *dialog;
+	GtkWidget *content_area;
 	GtkWidget *label;
 	GtkWidget *vbox;
 	GtkWidget *combo;
@@ -952,15 +955,17 @@ cmd_bookmarks_import (GtkAction *action,
 					      _("I_mport"),
 					      GTK_RESPONSE_OK,
 					      NULL);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
 	gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
 	gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->vbox), 2);
+	gtk_box_set_spacing (GTK_BOX (content_area), 2);
 
 	vbox = gtk_vbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 	gtk_widget_show (vbox);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox,
+	gtk_box_pack_start (GTK_BOX (content_area), vbox,
 			    TRUE, TRUE, 0);
 
 	label = gtk_label_new (_("Import bookmarks from:"));
diff --git a/src/bookmarks/ephy-topic-action.c b/src/bookmarks/ephy-topic-action.c
index d0c3fbfd7..32d922f14 100644
--- a/src/bookmarks/ephy-topic-action.c
+++ b/src/bookmarks/ephy-topic-action.c
@@ -79,7 +79,7 @@ drag_data_received_cb (GtkWidget *widget,
 	
 	topic = ephy_topic_action_get_topic (EPHY_TOPIC_ACTION (action));
 	
-	data = (char *)selection_data->data;
+	data = (char *) gtk_selection_data_get_data (selection_data);
 	bookmarks = ephy_shell_get_bookmarks (ephy_shell);
 	
 	netscape_url = g_strsplit (data, "\n", 2);
@@ -165,7 +165,7 @@ ephy_topic_action_sync_label (GtkAction *action,
 	}
 	else if (GTK_IS_MENU_ITEM (proxy))
 	{
-		label = GTK_BIN (proxy)->child;
+		label = gtk_bin_get_child (GTK_BIN (proxy));
 	}
 	else
 	{
diff --git a/src/bookmarks/ephy-topic-factory-action.c b/src/bookmarks/ephy-topic-factory-action.c
index 6c164807e..e8b8e583c 100644
--- a/src/bookmarks/ephy-topic-factory-action.c
+++ b/src/bookmarks/ephy-topic-factory-action.c
@@ -99,7 +99,7 @@ activate_item_cb (GtkWidget *menuitem, GtkWidget *placeholder)
 	g_return_if_fail (model);
 	
 	children = gtk_container_get_children (GTK_CONTAINER (etoolbar));
-	pos = g_list_index (children, toolbar->parent);
+	pos = g_list_index (children, gtk_widget_get_parent (toolbar));
 	index = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (item));
 	g_list_free (children);
 	
@@ -185,7 +185,7 @@ remove_placeholder_cb (GtkMenuShell *menushell, GtkWidget *placeholder)
 	g_object_set_data (G_OBJECT (model), EGG_TOOLBARS_MODEL_DATA, NULL);
 
 	children = gtk_container_get_children (GTK_CONTAINER (etoolbar));
-	pos = g_list_index (children, toolbar->parent);
+	pos = g_list_index (children, gtk_widget_get_parent (toolbar));
 	index = gtk_toolbar_get_item_index (GTK_TOOLBAR (toolbar), GTK_TOOL_ITEM (item));
 	g_list_free (children);