AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

remove GtkTooltips member from the GtkFileChooserDefault struct.

Browse Source 
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.


svn path=/trunk/; revision=20396
This commit is contained in:
Michael Natterer 2008-06-16 11:49:23 +00:00 committed by Michael Natterer
parent 6afb455e5a
commit 5337cdbb10
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2008-06-16 Carlos Garnacho <carlos@imendio.com> 2008-06-16 Carlos Garnacho <carlos@imendio.com>
Bug 538519 – GtkCellRendererPixbuf doesn't allow unsetting the icon Bug 538519 – GtkCellRendererPixbuf doesn't allow unsetting the icon

11
gtk/gtkfilechooserdefault.c
View File

@ -832,9 +832,6 @@ _gtk_file_chooser_default_init (GtkFileChooserDefault *impl)
gtk_box_set_spacing (GTK_BOX (impl), 12); gtk_box_set_spacing (GTK_BOX (impl), 12);
impl->tooltips = gtk_tooltips_new ();
g_object_ref_sink (impl->tooltips);
set_file_system_backend (impl); set_file_system_backend (impl);
profile_end ("end", NULL); profile_end ("end", NULL);
@ -1003,8 +1000,6 @@ gtk_file_chooser_default_finalize (GObject *object)
g_free (impl->edited_new_text); g_free (impl->edited_new_text);
g_object_unref (impl->tooltips);
G_OBJECT_CLASS (_gtk_file_chooser_default_parent_class)->finalize (object); 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); G_CALLBACK (filter_combo_changed), impl);
gtk_widget_set_tooltip_text (impl->filter_combo, 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; return impl->filter_combo;
} }
@ -4000,7 +3995,7 @@ shortcuts_pane_create (GtkFileChooserDefault *impl,
G_CALLBACK (add_bookmark_button_clicked_cb)); G_CALLBACK (add_bookmark_button_clicked_cb));
gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_add_button, TRUE, TRUE, 0); 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, 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 */ /* Remove bookmark button */
@ -4012,7 +4007,7 @@ shortcuts_pane_create (GtkFileChooserDefault *impl,
G_CALLBACK (remove_bookmark_button_clicked_cb)); G_CALLBACK (remove_bookmark_button_clicked_cb));
gtk_box_pack_start (GTK_BOX (hbox), impl->browse_shortcuts_remove_button, TRUE, TRUE, 0); 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, gtk_widget_set_tooltip_text (impl->browse_shortcuts_remove_button,
_("Remove the selected bookmark")); _("Remove the selected bookmark"));
return vbox; return vbox;
} }

3
gtk/gtkfilechooserprivate.h
View File

@ -28,7 +28,6 @@
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtksearchengine.h" #include "gtksearchengine.h"
#include "gtkquery.h" #include "gtkquery.h"
#include "gtktooltips.h"
#include "gtktreemodelsort.h" #include "gtktreemodelsort.h"
#include "gtktreestore.h" #include "gtktreestore.h"
#include "gtktreeview.h" #include "gtktreeview.h"
@ -253,8 +252,6 @@ struct _GtkFileChooserDefault
GtkFileFilter *current_filter; GtkFileFilter *current_filter;
GSList *filters; GSList *filters;
GtkTooltips *tooltips;
int num_volumes; int num_volumes;
int num_shortcuts; int num_shortcuts;
int num_bookmarks; int num_bookmarks;