GNOME.org
 

[gconf-editor] Use accessor functions instead direct access

commit 47855f68ae43d5089ffff8b477f290ade7785f5e
Author: Javier Jardón <jjardon gnome org>
Date:   Tue Apr 6 19:25:35 2010 +0200

    Use accessor functions instead direct access
    
    Fixes https://bugzilla.gnome.org/show_bug.cgi?id=612471

 configure.in                 |    2 +-
 src/gconf-bookmarks-dialog.c |    7 +++++--
 src/gconf-bookmarks.c        |    2 +-
 src/gconf-cell-renderer.c    |   10 +++++++---
 src/gconf-editor-window.c    |   14 +++++++++-----
 src/gconf-key-editor.c       |   26 +++++++++++++++++---------
 src/gconf-search-dialog.c    |   20 +++++++++++++-------
 7 files changed, 53 insertions(+), 28 deletions(-)
---
diff --git a/configure.in b/configure.in
index ef57b52..9117388 100644
--- a/configure.in
+++ b/configure.in
@@ -29,7 +29,7 @@ changequote([,])dnl
 
 PKG_CHECK_MODULES(GCONF_EDITOR,
 		  gconf-2.0 >= 2.9.2
-		  gtk+-2.0 >= 2.12.0
+		  gtk+-2.0 >= 2.20.0
 		  dbus-glib-1)
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
diff --git a/src/gconf-bookmarks-dialog.c b/src/gconf-bookmarks-dialog.c
index 9867a15..95d67b6 100644
--- a/src/gconf-bookmarks-dialog.c
+++ b/src/gconf-bookmarks-dialog.c
@@ -185,6 +185,7 @@ static void
 gconf_bookmarks_dialog_init (GConfBookmarksDialog *dialog)
 {
 	GtkWidget *scrolled_window, *hbox, *vbox;
+	GtkWidget *content_area;
 	GtkCellRenderer *cell;
 	GtkTreeViewColumn *column;
 	GConfClient *client;
@@ -192,9 +193,11 @@ gconf_bookmarks_dialog_init (GConfBookmarksDialog *dialog)
 	hbox = gtk_hbox_new (FALSE, 6);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+
 	gtk_dialog_set_has_separator (GTK_DIALOG (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);
 	gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
 	gtk_window_set_default_size (GTK_WINDOW (dialog), 300, 200);
 	
@@ -245,7 +248,7 @@ gconf_bookmarks_dialog_init (GConfBookmarksDialog *dialog)
 	
 	gtk_box_pack_start (GTK_BOX (vbox), dialog->delete_button, FALSE, FALSE, 0);
 
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), hbox, TRUE, TRUE, 0);
 	gtk_widget_show_all (hbox);
 
 	/* Listen for gconf changes */
diff --git a/src/gconf-bookmarks.c b/src/gconf-bookmarks.c
index ea7c71a..b75d2c9 100644
--- a/src/gconf-bookmarks.c
+++ b/src/gconf-bookmarks.c
@@ -61,7 +61,7 @@ gconf_bookmarks_set_have_icons (GtkWidget *menu, gboolean have_icons)
 {
         GList *items, *n;
 
-        items = GTK_MENU_SHELL (menu)->children;
+        items = gtk_container_get_children (GTK_CONTAINER (menu));
 
         for (n = items; n != NULL; n = n->next) 
                 if (GTK_IS_IMAGE_MENU_ITEM (n->data))
diff --git a/src/gconf-cell-renderer.c b/src/gconf-cell-renderer.c
index f8a5bf4..cab9444 100644
--- a/src/gconf-cell-renderer.c
+++ b/src/gconf-cell-renderer.c
@@ -213,9 +213,11 @@ gconf_cell_renderer_text_editing_done (GtkCellEditable *entry, GConfCellRenderer
 {
 	const gchar *path;
 	const gchar *new_text;
+	gboolean editing_canceled = FALSE;
 	GConfValue *value;
-	
-	if (GTK_ENTRY (entry)->editing_canceled)
+
+	g_object_get (entry, "editing-canceled", &editing_canceled, NULL);
+	if (editing_canceled != FALSE)
 		return;
 
 	path = g_object_get_data (G_OBJECT (entry), GCONF_CELL_RENDERER_TEXT_PATH);
@@ -454,7 +456,9 @@ gconf_cell_renderer_class_init (GConfCellRendererClass *klass)
 static void
 gconf_cell_renderer_init (GConfCellRenderer *renderer)
 {
-	GTK_CELL_RENDERER (renderer)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
+	g_object_set (renderer,
+	              "mode", GTK_CELL_RENDERER_MODE_ACTIVATABLE,
+	              NULL);
 	
 	renderer->text_renderer = gtk_cell_renderer_text_new ();
 	g_object_ref_sink (renderer->text_renderer);
diff --git a/src/gconf-editor-window.c b/src/gconf-editor-window.c
index 5f25b31..4c9210e 100644
--- a/src/gconf-editor-window.c
+++ b/src/gconf-editor-window.c
@@ -617,7 +617,8 @@ gconf_editor_window_test_expand_row (GtkTreeView       *tree_view,
     return FALSE;
 
   cursor = gdk_cursor_new (GDK_WATCH);
-  gdk_window_set_cursor (GTK_WIDGET (gconfwindow)->window, cursor);
+  gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (gconfwindow)),
+                         cursor);
   gdk_cursor_unref (cursor);
 
   gdk_display_flush (gtk_widget_get_display (GTK_WIDGET (gconfwindow)));
@@ -636,7 +637,7 @@ gconf_editor_window_row_expanded (GtkTreeView       *tree_view,
   if (!gtk_widget_get_realized (GTK_WIDGET (gconfwindow)))
     return;
 
-  gdk_window_set_cursor (GTK_WIDGET (gconfwindow)->window, NULL);
+  gdk_window_set_cursor (gtk_widget_get_window (GTK_WIDGET (gconfwindow)), NULL);
   gdk_display_flush (gtk_widget_get_display (GTK_WIDGET (gconfwindow)));
 }
 
@@ -1048,7 +1049,7 @@ gconf_editor_window_list_view_popup_menu (GtkWidget *widget, GConfEditorWindow *
 	
 	gtk_menu_popup (GTK_MENU (window->popup_menu), NULL, NULL,
 			(GtkMenuPositionFunc) gconf_editor_window_list_view_popup_position, 
-			widget->window,
+			gtk_widget_get_window (widget),
 			0, gtk_get_current_event_time ());
 }
 
@@ -1290,10 +1291,13 @@ gconf_editor_window_setup_ui_prefs_handler (GConfEditorWindow *window)
 static void
 gconf_editor_window_style_set (GtkWidget *widget, GtkStyle *prev_style, GtkWidget *text_view)
 {
+	GtkStyle *style;
+
+	style = gtk_widget_get_style (widget);
 	gtk_widget_modify_base (text_view, GTK_STATE_NORMAL,
-				&GTK_WIDGET (widget)->style->bg[GTK_STATE_NORMAL]);
+				&style->bg[GTK_STATE_NORMAL]);
 	gtk_widget_modify_text (text_view, GTK_STATE_NORMAL,
-				&GTK_WIDGET (widget)->style->fg[GTK_STATE_NORMAL]);
+				&style->fg[GTK_STATE_NORMAL]);
 }
 
 void
diff --git a/src/gconf-key-editor.c b/src/gconf-key-editor.c
index a08ec61..c265ba5 100644
--- a/src/gconf-key-editor.c
+++ b/src/gconf-key-editor.c
@@ -83,10 +83,10 @@ bool_button_toggled (GtkWidget *bool_button,
 		     gpointer   data)
 {
 	if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (bool_button)))
-		gtk_label_set_label (GTK_LABEL (GTK_BIN (bool_button)->child),
+		gtk_label_set_label (GTK_LABEL (gtk_bin_get_child (GTK_BIN (bool_button))),
 				     _("T_rue"));
 	else
-		gtk_label_set_label (GTK_LABEL (GTK_BIN (bool_button)->child),
+		gtk_label_set_label (GTK_LABEL (gtk_bin_get_child (GTK_BIN (bool_button))),
 				     _("_False"));
 }
 
@@ -208,6 +208,7 @@ static void
 list_add_clicked (GtkButton *button,
 		  GConfKeyEditor *editor)
 {
+	GtkWidget *content_area;
 	GtkWidget *dialog;
 	GtkWidget *hbox;
 	GtkWidget *value_widget;
@@ -222,15 +223,17 @@ list_add_clicked (GtkButton *button,
 					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      GTK_STOCK_OK, 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_container_set_border_width (GTK_CONTAINER (dialog), 5);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (editor)->vbox), 2);
+	gtk_box_set_spacing (GTK_BOX (content_area), 2);
 	
 	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new_with_mnemonic (_("_New list value:"));
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -308,6 +311,7 @@ list_add_clicked (GtkButton *button,
 static void
 list_edit_element (GConfKeyEditor *editor)
 {
+	GtkWidget *content_area;
 	GtkWidget *dialog;
 	GtkWidget *hbox;
 	GtkWidget *value_widget;
@@ -324,15 +328,17 @@ list_edit_element (GConfKeyEditor *editor)
 					      GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
 					      GTK_STOCK_OK, 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_container_set_border_width (GTK_CONTAINER (dialog), 5);
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (editor)->vbox), 2);
+	gtk_box_set_spacing (GTK_BOX (content_area), 2);
 	
 	hbox = gtk_hbox_new (FALSE, 12);
 	gtk_container_set_border_width (GTK_CONTAINER (hbox), 5);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), hbox, FALSE, FALSE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), hbox, FALSE, FALSE, 0);
 
 	label = gtk_label_new_with_mnemonic (_("_Edit list value:"));
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
@@ -527,6 +533,7 @@ gconf_key_editor_class_init (GConfKeyEditorClass *klass)
 static void
 gconf_key_editor_init (GConfKeyEditor *editor)
 {
+	GtkWidget *content_area;
 	GtkWidget *hbox, *vbox, *framebox;
 	GtkWidget *label, *image;
 	GtkWidget *value_box;
@@ -540,15 +547,16 @@ gconf_key_editor_init (GConfKeyEditor *editor)
 				GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, 
 				GTK_STOCK_OK, GTK_RESPONSE_OK,
 				NULL);
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (editor));
 	gtk_dialog_set_default_response (GTK_DIALOG (editor), GTK_RESPONSE_OK);
-	
+
 	gtk_container_set_border_width (GTK_CONTAINER (editor), 5);
 	gtk_dialog_set_has_separator (GTK_DIALOG (editor), FALSE);
 	gtk_window_set_resizable (GTK_WINDOW (editor), FALSE);
-	gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (editor)->vbox), 2);
+	gtk_box_set_spacing (GTK_BOX (content_area), 2);
 
 	vbox = gtk_vbox_new (FALSE, 6);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (editor)->vbox), vbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
 	gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
 	gtk_widget_show_all (vbox);
 
diff --git a/src/gconf-search-dialog.c b/src/gconf-search-dialog.c
index d033019..8c67022 100644
--- a/src/gconf-search-dialog.c
+++ b/src/gconf-search-dialog.c
@@ -79,6 +79,7 @@ gconf_search_dialog_search (GtkWidget *button, GConfSearchDialog *dialog)
 {
 	GConfEditorWindow *window;
 	GdkCursor *cursor;
+	GdkWindow *dialog_window;
 
 	gchar *pattern;
 	int res;
@@ -88,9 +89,10 @@ gconf_search_dialog_search (GtkWidget *button, GConfSearchDialog *dialog)
 	window->output_window_type = GCONF_EDITOR_WINDOW_OUTPUT_WINDOW_SEARCH;
 
 	pattern = g_strdup (gtk_entry_get_text (GTK_ENTRY (dialog->entry)));
+	dialog_window = gtk_widget_get_window (GTK_WIDGET (dialog));
 
 	cursor = gdk_cursor_new (GDK_WATCH);
-	gdk_window_set_cursor (GTK_WIDGET (dialog)->window, cursor);
+	gdk_window_set_cursor (dialog_window, cursor);
 	gdk_cursor_unref (cursor);
 	gdk_display_flush (gtk_widget_get_display (GTK_WIDGET (dialog)));
 
@@ -104,7 +106,7 @@ gconf_search_dialog_search (GtkWidget *button, GConfSearchDialog *dialog)
 	g_free (pattern);
 
 	if (dialog != NULL && GTK_IS_WIDGET (dialog)) {
-		gdk_window_set_cursor (GTK_WIDGET (dialog)->window, NULL);
+		gdk_window_set_cursor (dialog_window, NULL);
 		gdk_display_flush (gtk_widget_get_display (GTK_WIDGET (dialog)));
 
 		if (res != 0) {
@@ -118,14 +120,18 @@ gconf_search_dialog_search (GtkWidget *button, GConfSearchDialog *dialog)
 static void
 gconf_search_dialog_init (GConfSearchDialog *dialog)
 {
+	GtkWidget *action_area, *content_area;
 	GtkWidget *hbox;
 	GtkWidget *vbox;
 	GtkWidget *label;
 
+	content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog));
+	action_area = gtk_dialog_get_action_area (GTK_DIALOG (dialog));
+
 	gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE);
 	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);
 	
 	hbox = gtk_hbox_new (FALSE, 12);
 	vbox = gtk_vbox_new (FALSE, 6);
@@ -147,7 +153,7 @@ gconf_search_dialog_init (GConfSearchDialog *dialog)
 	g_signal_connect (dialog->search_button, "clicked",
 			  G_CALLBACK (gconf_search_dialog_search), dialog);
 
-	GTK_WIDGET_SET_FLAGS(dialog->search_button, GTK_CAN_DEFAULT);
+	gtk_widget_set_can_default (dialog->search_button, TRUE);
 	gtk_window_set_default(GTK_WINDOW(dialog), dialog->search_button);
 	gtk_entry_set_activates_default(GTK_ENTRY(dialog->entry), TRUE);
 	
@@ -162,9 +168,9 @@ gconf_search_dialog_init (GConfSearchDialog *dialog)
 	dialog->search_in_values = gtk_check_button_new_with_mnemonic (_("Search also in key _values"));
 	gtk_box_pack_start (GTK_BOX (vbox), dialog->search_in_values, TRUE, TRUE, 0);
 
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), vbox, TRUE, TRUE, 0);
-	gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->action_area), dialog->search_button, TRUE, TRUE, 0);
-	gtk_widget_show_all (GTK_DIALOG(dialog)->action_area);
+	gtk_box_pack_start (GTK_BOX (content_area), vbox, TRUE, TRUE, 0);
+	gtk_box_pack_start (GTK_BOX (action_area), dialog->search_button, TRUE, TRUE, 0);
+	gtk_widget_show_all (action_area);
 	gtk_widget_show_all (vbox);
 	
 	gtk_widget_show_all (hbox);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]