gconf-editor r1430 - in trunk: . src

[cosimoc svn gnome org]

Author: cosimoc
Date: Sun Oct 19 19:40:52 2008
New Revision: 1430
URL: http://svn.gnome.org/viewvc/gconf-editor?rev=1430&view=rev

Log:
2008-10-19  Cosimo Cecchi  <cosimoc gnome org>

	* configure.in:
	Bump to 2.25.1, enforce GLib/GTK+ deprecation CFLAGS under
	maintainer mode.

	* src/Makefile.am:
	* src/gconf-cell-renderer.c: (gconf_cell_renderer_init):
	* src/gconf-key-editor.c: (gconf_key_editor_init):
	* src/gconf-search.c: (gconf_tree_model_build_match_list):
	* src/gconf-tree-model.c:
	(gconf_tree_model_get_tree_path_from_gconf_path):
	* src/gedit-output-window.c: (gedit_output_window_init),
	(gedit_output_window_finalize):
	Port to GtkTooltip and avoid using deprecated functions.


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/src/gconf-cell-renderer.c
   trunk/src/gconf-key-editor.c
   trunk/src/gconf-search.c
   trunk/src/gconf-tree-model.c
   trunk/src/gedit-output-window.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Oct 19 19:40:52 2008
@@ -1,5 +1,5 @@
 AC_INIT([GConf Editor],
-        [2.24.1],
+        [2.25.1],
         [http://bugzilla.gnome.org/enter_bug.cgi?product=gconf-editor],
         [gconf-editor])
 AC_CONFIG_SRCDIR([src/main.c])
@@ -30,7 +30,13 @@
 
 PKG_CHECK_MODULES(GCONF_EDITOR,
 		  gconf-2.0 >= 2.9.2
-		  gtk+-2.0 >= 2.10.0)
+		  gtk+-2.0 >= 2.12.0)
+
+if test "$enable_maintainer_mode" = "yes"; then
+	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED \
+-DG_DISABLE_SINGLE_INCLUDES -DGTK_DISABLE_SINGLE_INCLUDES"
+	AC_SUBST(DISABLE_DEPRECATED_CFLAGS)
+fi
 
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Sun Oct 19 19:40:52 2008
@@ -2,6 +2,7 @@
 	-DLOCALEDIR=\""$(datadir)/locale"\" \
 	-DDATADIR=\""$(pkgdatadir)"\" 	\
 	-DICONDIR="\"$(pkgdatadir)/icons\"" \
+	$(DISABLE_DEPRECATED_CFLAGS) \
 	$(GCONF_EDITOR_CFLAGS)
 
 bin_PROGRAMS = gconf-editor

Modified: trunk/src/gconf-cell-renderer.c
==============================================================================
--- trunk/src/gconf-cell-renderer.c	(original)
+++ trunk/src/gconf-cell-renderer.c	Sun Oct 19 19:40:52 2008
@@ -457,12 +457,10 @@
 	GTK_CELL_RENDERER (renderer)->mode = GTK_CELL_RENDERER_MODE_ACTIVATABLE;
 	
 	renderer->text_renderer = gtk_cell_renderer_text_new ();
-	g_object_ref (renderer->text_renderer);
-	gtk_object_sink (GTK_OBJECT (renderer->text_renderer));
+	g_object_ref_sink (renderer->text_renderer);
 
 	renderer->toggle_renderer = gtk_cell_renderer_toggle_new ();
-	g_object_ref (renderer->toggle_renderer);
-	gtk_object_sink (GTK_OBJECT (renderer->toggle_renderer));
+	g_object_ref_sink (renderer->toggle_renderer);
 }
 
 

Modified: trunk/src/gconf-key-editor.c
==============================================================================
--- trunk/src/gconf-key-editor.c	(original)
+++ trunk/src/gconf-key-editor.c	Sun Oct 19 19:40:52 2008
@@ -570,7 +570,7 @@
 	gtk_size_group_add_widget (size_group, label);
 	gtk_box_pack_start (GTK_BOX (hbox), label, FALSE, FALSE, 0);
 	editor->name_entry = gtk_entry_new ();
-	gtk_widget_set_usize (editor->name_entry, 250, -1);
+	gtk_widget_set_size_request (editor->name_entry, 250, -1);
 	gtk_entry_set_activates_default (GTK_ENTRY (editor->name_entry), TRUE);
 	gtk_box_pack_start (GTK_BOX (hbox), editor->name_entry, TRUE, TRUE, 0);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label), editor->name_entry);

Modified: trunk/src/gconf-search.c
==============================================================================
--- trunk/src/gconf-search.c	(original)
+++ trunk/src/gconf-search.c	Sun Oct 19 19:40:52 2008
@@ -141,7 +141,7 @@
 
 	g_object_add_weak_pointer (st->searching, (gpointer)&st->searching);
 
-	if (!gtk_tree_model_get_iter_root (GTK_TREE_MODEL (tree_model), &iter_root)) {
+	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (tree_model), &iter_root)) {
 
 		/* Ugh, something is terribly wrong */
 		return 0;

Modified: trunk/src/gconf-tree-model.c
==============================================================================
--- trunk/src/gconf-tree-model.c	(original)
+++ trunk/src/gconf-tree-model.c	Sun Oct 19 19:40:52 2008
@@ -64,7 +64,7 @@
 
 	key_array = g_strsplit (key + 1, "/", 0);
 
-	if (!gtk_tree_model_get_iter_root (GTK_TREE_MODEL (tree_model), &iter)) {
+	if (!gtk_tree_model_get_iter_first (GTK_TREE_MODEL (tree_model), &iter)) {
 
 		/* Ugh, something is terribly wrong */
 		g_strfreev (key_array);

Modified: trunk/src/gedit-output-window.c
==============================================================================
--- trunk/src/gedit-output-window.c	(original)
+++ trunk/src/gedit-output-window.c	Sun Oct 19 19:40:52 2008
@@ -40,8 +40,6 @@
 
 struct _GeditOutputWindowPrivate
 {
-	GtkTooltips 	*tooltips;
-	
 	GtkWidget 	*close_button;
 	GtkWidget 	*copy_button;
 	GtkWidget 	*clear_button;
@@ -332,11 +330,6 @@
 
 	output_window->priv = g_new0 (GeditOutputWindowPrivate, 1);
 
-	output_window->priv->tooltips = gtk_tooltips_new ();
-
-	g_object_ref (G_OBJECT (output_window->priv->tooltips ));
-	gtk_object_sink (GTK_OBJECT (output_window->priv->tooltips ));
-
 	settings = gtk_widget_get_settings (GTK_WIDGET (output_window));
 
 	gtk_icon_size_lookup_for_settings (settings,
@@ -350,10 +343,8 @@
 	output_window->priv->close_button = gtk_button_new ();
 	gtk_box_pack_start (GTK_BOX (vbox1), output_window->priv->close_button, FALSE, FALSE, 0);
 
-	gtk_tooltips_set_tip (output_window->priv->tooltips, 
-			      output_window->priv->close_button, 
-			      _("Close the output window"), 
-			      NULL);
+	gtk_widget_set_tooltip_text (output_window->priv->close_button,
+				     _("Close the output window"));
 
 	gedit_output_window_format_button (GTK_BUTTON (output_window->priv->close_button), w, h);
 
@@ -387,10 +378,8 @@
 	output_window->priv->copy_button = gtk_button_new ();
 	gtk_box_pack_start (GTK_BOX (vbox2), output_window->priv->copy_button, FALSE, FALSE, 0);
 
-	gtk_tooltips_set_tip (output_window->priv->tooltips, 
-			      output_window->priv->copy_button, 
-			      _("Copy selected lines"), 
-			      NULL);
+	gtk_widget_set_tooltip_text (output_window->priv->copy_button, 
+				     _("Copy selected lines"));
 
 	gedit_output_window_format_button (GTK_BUTTON (output_window->priv->copy_button), w, h);
 
@@ -405,11 +394,9 @@
 	/* Create the clear button */
 	output_window->priv->clear_button = gtk_button_new ();
 	gtk_box_pack_start (GTK_BOX (vbox2), output_window->priv->clear_button, FALSE, FALSE, 0);
-	
-	gtk_tooltips_set_tip (output_window->priv->tooltips, 
-			      output_window->priv->clear_button, 
-			      _("Clear the output window"), 
-			      NULL);
+
+	gtk_widget_set_tooltip_text (output_window->priv->clear_button, 
+				     _("Clear the output window"));
 	
 	gedit_output_window_format_button (GTK_BUTTON (output_window->priv->clear_button), w, h);
 
@@ -498,8 +485,6 @@
 
 	ow = GEDIT_OUTPUT_WINDOW (object);
 
-	g_object_unref (ow->priv->tooltips);
-	
 	if (ow->priv != NULL)
 	{
 		g_free (ow->priv);