callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't leak the overflow menu.

Browse Source 
Sat Jan 17 12:37:46 2004  Soeren Sandmann  <sandmann@daimi.au.dk>

	* gtk/gtktoolbar.c (gtk_toolbar_finalize): Don't leak the
	overflow menu.

	* gtk/gtktoolbar.h (struct _GtkToolbar): Make some fields public.
	[#127726]
This commit is contained in:
Soeren Sandmann 2004-01-17 11:51:28 +00:00 committed by Søren Sandmann Pedersen
parent 49a0e79dd6
commit 43b44fff94
7 changed files with 55 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ChangeLog
View File

@ -1,3 +1,11 @@
Sat Jan 17 12:37:46 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_finalize): Don't leak the
overflow menu.
* gtk/gtktoolbar.h (struct _GtkToolbar): Make some fields public.
[#127726]
2004-01-16 Federico Mena Quintero <federico@ximian.com> 2004-01-16 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a * gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a

8
ChangeLog.pre-2-10
View File

@ -1,3 +1,11 @@
Sat Jan 17 12:37:46 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_finalize): Don't leak the
overflow menu.
* gtk/gtktoolbar.h (struct _GtkToolbar): Make some fields public.
[#127726]
2004-01-16 Federico Mena Quintero <federico@ximian.com> 2004-01-16 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a * gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a

8
ChangeLog.pre-2-4
View File

@ -1,3 +1,11 @@
Sat Jan 17 12:37:46 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_finalize): Don't leak the
overflow menu.
* gtk/gtktoolbar.h (struct _GtkToolbar): Make some fields public.
[#127726]
2004-01-16 Federico Mena Quintero <federico@ximian.com> 2004-01-16 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a * gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a

8
ChangeLog.pre-2-6
View File

@ -1,3 +1,11 @@
Sat Jan 17 12:37:46 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_finalize): Don't leak the
overflow menu.
* gtk/gtktoolbar.h (struct _GtkToolbar): Make some fields public.
[#127726]
2004-01-16 Federico Mena Quintero <federico@ximian.com> 2004-01-16 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a * gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a

8
ChangeLog.pre-2-8
View File

@ -1,3 +1,11 @@
Sat Jan 17 12:37:46 2004 Soeren Sandmann <sandmann@daimi.au.dk>
* gtk/gtktoolbar.c (gtk_toolbar_finalize): Don't leak the
overflow menu.
* gtk/gtktoolbar.h (struct _GtkToolbar): Make some fields public.
[#127726]
2004-01-16 Federico Mena Quintero <federico@ximian.com> 2004-01-16 Federico Mena Quintero <federico@ximian.com>
* gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a * gtk/gtkfilesystemmodel.c (struct _GtkFileSystemModel): Added a

5
gtk/gtktoolbar.c
View File

@ -3602,7 +3602,7 @@ gtk_toolbar_finalize (GObject *object)
GList *list; GList *list;
GtkToolbar *toolbar = GTK_TOOLBAR (object); GtkToolbar *toolbar = GTK_TOOLBAR (object);
GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar); GtkToolbarPrivate *priv = GTK_TOOLBAR_GET_PRIVATE (toolbar);
if (toolbar->tooltips) if (toolbar->tooltips)
g_object_unref (toolbar->tooltips); g_object_unref (toolbar->tooltips);
@ -3618,6 +3618,9 @@ gtk_toolbar_finalize (GObject *object)
g_timer_destroy (priv->timer); g_timer_destroy (priv->timer);
if (priv->menu)
gtk_widget_destroy (priv->menu);
if (priv->idle_id) if (priv->idle_id)
g_source_remove (priv->idle_id); g_source_remove (priv->idle_id);

16
gtk/gtktoolbar.h
View File

@ -76,14 +76,14 @@ struct _GtkToolbarChild
GtkWidget *label; GtkWidget *label;
}; };
#endif /* GTK_DISABLE_DEPRECATED */
typedef enum typedef enum
{ {
GTK_TOOLBAR_SPACE_EMPTY, GTK_TOOLBAR_SPACE_EMPTY,
GTK_TOOLBAR_SPACE_LINE GTK_TOOLBAR_SPACE_LINE
} GtkToolbarSpaceStyle; } GtkToolbarSpaceStyle;
#endif /* GTK_DISABLE_DEPRECATED */
typedef struct _GtkToolbar GtkToolbar; typedef struct _GtkToolbar GtkToolbar;
typedef struct _GtkToolbarClass GtkToolbarClass; typedef struct _GtkToolbarClass GtkToolbarClass;
typedef struct _GtkToolbarPrivate GtkToolbarPrivate; typedef struct _GtkToolbarPrivate GtkToolbarPrivate;
@ -92,7 +92,7 @@ struct _GtkToolbar
{ {
GtkContainer container; GtkContainer container;
/*< private >*/ /*< public >*/
gint num_children; gint num_children;
GList *children; GList *children;
GtkOrientation orientation; GtkOrientation orientation;
@ -101,6 +101,7 @@ struct _GtkToolbar
GtkTooltips *tooltips; GtkTooltips *tooltips;
/*< private >*/
gint button_maxw; /* maximum width of homogeneous children */ gint button_maxw; /* maximum width of homogeneous children */
gint button_maxh; /* maximum height of homogeneous children */ gint button_maxh; /* maximum height of homogeneous children */
@ -164,8 +165,13 @@ void gtk_toolbar_set_drop_highlight_item (GtkToolbar *toolbar,
gint index); gint index);
/* internal function */ /* internal functions */
gchar * _gtk_toolbar_elide_underscores (const gchar *original); gchar * _gtk_toolbar_elide_underscores (const gchar *original);
/* these two functions actually accept NULL for the toolbar, in which case
* you'll get a default value
*/
int _gtk_toolbar_get_space_size (GtkToolbar *toolbar);
GtkToolbarSpaceStyle _gtk_toolbar_get_space_style (GtkToolbar *toolbar);
#ifndef GTK_DISABLE_DEPRECATED #ifndef GTK_DISABLE_DEPRECATED
void gtk_toolbar_set_icon_size (GtkToolbar *toolbar, void gtk_toolbar_set_icon_size (GtkToolbar *toolbar,