gtk+ r20396 - in trunk: . gtk

[mitch svn gnome org]

Author: mitch
Date: Mon Jun 16 11:49:23 2008
New Revision: 20396
URL: http://svn.gnome.org/viewvc/gtk+?rev=20396&view=rev

Log:
2008-06-16  Michael Natterer  <mitch imendio com>

	* gtk/gtkfilechooserprivate.h: remove GtkTooltips member from the
	GtkFileChooserDefault struct.

	* gtk/gtkfilechooserdefault.c: don't allocate and free the
	GtkTooltips.



Modified:
   trunk/ChangeLog
   trunk/gtk/gtkfilechooserdefault.c
   trunk/gtk/gtkfilechooserprivate.h

Modified: trunk/gtk/gtkfilechooserdefault.c
==============================================================================
--- trunk/gtk/gtkfilechooserdefault.c	(original)
+++ trunk/gtk/gtkfilechooserdefault.c	Mon Jun 16 11:49:23 2008
@@ -832,9 +832,6 @@
 
   gtk_box_set_spacing (GTK_BOX (impl), 12);
 
-  impl->tooltips = gtk_tooltips_new ();
-  g_object_ref_sink (impl->tooltips);
-
   set_file_system_backend (impl);
 
   profile_end ("end", NULL);
@@ -1003,8 +1000,6 @@
 
   g_free (impl->edited_new_text);
 
-  g_object_unref (impl->tooltips);
-
   G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->finalize (object);
 }
 
@@ -2503,7 +2498,7 @@
 		    G_CALLBACK (filter_combo_changed), impl);
 
   gtk_widget_set_tooltip_text (impl->filter_combo,
-			  _("Select which types of files are shown"));
+                               _("Select which types of files are shown"));
 
   return impl->filter_combo;
 }
@@ -4000,7 +3995,7 @@
 						  G_CALLBACK (add_bookmark_button_clicked_cb));
   gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_add_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text (impl->browse_shortcuts_add_button,
-                        _("Add the selected folder to the Bookmarks"));
+                               _("Add the selected folder to the Bookmarks"));
 
   /* Remove bookmark button */
 
@@ -4012,7 +4007,7 @@
 						     G_CALLBACK (remove_bookmark_button_clicked_cb));
   gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_remove_button, TRUE, TRUE, 0);
   gtk_widget_set_tooltip_text (impl->browse_shortcuts_remove_button,
-                        _("Remove the selected bookmark"));
+                               _("Remove the selected bookmark"));
 
   return vbox;
 }

Modified: trunk/gtk/gtkfilechooserprivate.h
==============================================================================
--- trunk/gtk/gtkfilechooserprivate.h	(original)
+++ trunk/gtk/gtkfilechooserprivate.h	Mon Jun 16 11:49:23 2008
@@ -28,7 +28,6 @@
 #include "gtkrecentmanager.h"
 #include "gtksearchengine.h"
 #include "gtkquery.h"
-#include "gtktooltips.h"
 #include "gtktreemodelsort.h"
 #include "gtktreestore.h"
 #include "gtktreeview.h"
@@ -253,8 +252,6 @@
   GtkFileFilter *current_filter;
   GSList *filters;
 
-  GtkTooltips *tooltips;
-
   int num_volumes;
   int num_shortcuts;
   int num_bookmarks;