[goffice] Use gtk_buildable_get_name instead of gtk_widget_get_name.



commit 8de9f08bdeadf2b9b15bca4f2edde0af047b7c2b
Author: Jean Brefort <jean brefort normalesup org>
Date:   Fri Feb 19 11:12:25 2010 +0100

    Use gtk_buildable_get_name instead of gtk_widget_get_name.

 ChangeLog                          |   10 ++++++++++
 NEWS                               |    2 ++
 goffice/graph/gog-axis-line.c      |    4 ++--
 goffice/graph/gog-axis.c           |    2 +-
 goffice/graph/gog-object.c         |    2 +-
 goffice/utils/go-editor.c          |    2 +-
 plugins/plot_xy/gog-bubble-prefs.c |    2 +-
 7 files changed, 18 insertions(+), 6 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 20e0485..45f4027 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-02-19  Jean Brefort  <jean brefort normalesup org>
+
+	* goffice/graph/gog-axis-line.c (cb_position_toggled),
+	(cb_tick_toggle_changed): use gtk_buildable_get_name instead of
+	gtk_widget_get_name where appropriate.
+	* goffice/graph/gog-axis.c (cb_axis_toggle_changed):
+	* goffice/graph/gog-object.c (cb_chart_position_changed):
+	* goffice/utils/go-editor.c (go_editor_register_widget):
+	* plugins/plot_xy/gog-bubble-prefs.c (cb_type_changed):
+
 2010-02-14  Jean Brefort  <jean brefort normalesup org>
 
 	* goffice/canvas/goc-canvas.c (button_press_cb),
diff --git a/NEWS b/NEWS
index 388004a..138cfd0 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,8 @@ goffice 0.8.1:
 
 Jean:
 	* Remove libglade dependency from pc file. [#609833]
+	* Use gtk_buildable_get_name instead of gtk_widget_get_name where
+	appropriate. Make things work with gtk+ >= 2.19.2.
 
 --------------------------------------------------------------------------
 goffice 0.8.0:
diff --git a/goffice/graph/gog-axis-line.c b/goffice/graph/gog-axis-line.c
index ca5cb38..7e55a51 100644
--- a/goffice/graph/gog-axis-line.c
+++ b/goffice/graph/gog-axis-line.c
@@ -418,7 +418,7 @@ cb_position_toggled (GtkWidget *button, AxisBasePrefs *state)
 {
 	GogAxisBase *axis_base = state->axis_base;
 	GogAxisPosition position;
-	char const *widget_name = gtk_widget_get_name (button);
+	char const *widget_name = gtk_buildable_get_name (GTK_BUILDABLE (button));
 	GSList *lines, *axes, *aptr, *lptr;
 
 	if (!gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (button)))
@@ -461,7 +461,7 @@ static void
 cb_tick_toggle_changed (GtkToggleButton *toggle_button, GObject *axis_base)
 {
 	g_object_set (axis_base,
-		gtk_widget_get_name (GTK_WIDGET (toggle_button)),
+		gtk_buildable_get_name (GTK_BUILDABLE (toggle_button)),
 		gtk_toggle_button_get_active (toggle_button),
 		NULL);
 }
diff --git a/goffice/graph/gog-axis.c b/goffice/graph/gog-axis.c
index 2245554..d20d027 100644
--- a/goffice/graph/gog-axis.c
+++ b/goffice/graph/gog-axis.c
@@ -2125,7 +2125,7 @@ static void
 cb_axis_toggle_changed (GtkToggleButton *toggle_button, GObject *axis)
 {
 	g_object_set (axis,
-		gtk_widget_get_name (GTK_WIDGET (toggle_button)),
+		gtk_buildable_get_name (GTK_BUILDABLE (toggle_button)),
 		gtk_toggle_button_get_active (toggle_button),
 		NULL);
 }
diff --git a/goffice/graph/gog-object.c b/goffice/graph/gog-object.c
index 2ffdbaf..0d0e3d0 100644
--- a/goffice/graph/gog-object.c
+++ b/goffice/graph/gog-object.c
@@ -363,7 +363,7 @@ cb_update_editor (GogObject *gobj, ObjectPrefState *state)
 static void
 cb_chart_position_changed (GtkWidget *spin, ObjectPrefState *state)
 {
-	g_object_set (G_OBJECT (state->gobj), gtk_widget_get_name (spin),
+	g_object_set (G_OBJECT (state->gobj), gtk_buildable_get_name (GTK_BUILDABLE (spin)),
 		      (int) gtk_spin_button_get_value (GTK_SPIN_BUTTON (spin)), NULL);
 }
 
diff --git a/goffice/utils/go-editor.c b/goffice/utils/go-editor.c
index d8172d1..b0541f7 100644
--- a/goffice/utils/go-editor.c
+++ b/goffice/utils/go-editor.c
@@ -123,7 +123,7 @@ go_editor_register_widget (GOEditor *editor, GtkWidget *widget)
 	g_return_if_fail (editor != NULL);
 	g_return_if_fail (GTK_IS_WIDGET (widget));
 
-	g_datalist_set_data (&editor->registered_widgets, gtk_widget_get_name (widget), widget);
+	g_datalist_set_data (&editor->registered_widgets, gtk_buildable_get_name (GTK_BUILDABLE (widget)), widget);
 }
 
 /**
diff --git a/plugins/plot_xy/gog-bubble-prefs.c b/plugins/plot_xy/gog-bubble-prefs.c
index e83f62a..1e5a796 100644
--- a/plugins/plot_xy/gog-bubble-prefs.c
+++ b/plugins/plot_xy/gog-bubble-prefs.c
@@ -34,7 +34,7 @@ cb_type_changed (GtkToggleButton* button, GObject *bubble)
 {
 	if (gtk_toggle_button_get_active (button))
 		g_object_set (bubble, "size-as-area",
-			strcmp (gtk_widget_get_name ((GtkWidget*) button), "area")? FALSE: TRUE, NULL);
+			strcmp (gtk_buildable_get_name (GTK_BUILDABLE (button)), "area")? FALSE: TRUE, NULL);
 }
 
 static void



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]