From 5337cdbb105e4a7ea9da0c98dcfe0290ce5e53ba Mon Sep 17 00:00:00 2001 From: Michael Natterer Date: Mon, 16 Jun 2008 11:49:23 +0000 Subject: [PATCH] remove GtkTooltips member from the GtkFileChooserDefault struct. 2008-06-16 Michael Natterer * gtk/gtkfilechooserprivate.h: remove GtkTooltips member from the GtkFileChooserDefault struct. * gtk/gtkfilechooserdefault.c: don't allocate and free the GtkTooltips. svn path=/trunk/; revision=20396 --- ChangeLog | 8 ++++++++ gtk/gtkfilechooserdefault.c | 11 +++-------- gtk/gtkfilechooserprivate.h | 3 --- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/ChangeLog b/ChangeLog index 530a3bb087..58a375cab5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2008-06-16 Michael Natterer + + * gtk/gtkfilechooserprivate.h: remove GtkTooltips member from the + GtkFileChooserDefault struct. + + * gtk/gtkfilechooserdefault.c: don't allocate and free the + GtkTooltips. + 2008-06-16 Carlos Garnacho Bug 538519 – GtkCellRendererPixbuf doesn't allow unsetting the icon diff --git a/gtk/gtkfilechooserdefault.c b/gtk/gtkfilechooserdefault.c index 07b9eebf9a..dcd4ea4670 100644 --- a/gtk/gtkfilechooserdefault.c +++ b/gtk/gtkfilechooserdefault.c @@ -832,9 +832,6 @@ _gtk_file_chooser_default_init (GtkFileChooserDefault *impl) 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 @@ gtk_file_chooser_default_finalize (GObject *object) 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 @@ filter_create (GtkFileChooserDefault *impl) 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 @@ shortcuts_pane_create (GtkFileChooserDefault *impl, 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 @@ shortcuts_pane_create (GtkFileChooserDefault *impl, 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; } diff --git a/gtk/gtkfilechooserprivate.h b/gtk/gtkfilechooserprivate.h index d5a19c275b..39be43366a 100644 --- a/gtk/gtkfilechooserprivate.h +++ b/gtk/gtkfilechooserprivate.h @@ -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 @@ struct _GtkFileChooserDefault GtkFileFilter *current_filter; GSList *filters; - GtkTooltips *tooltips; - int num_volumes; int num_shortcuts; int num_bookmarks;