Hello community,
here is the log from the commit of package gnome-main-menu
checked in at Fri Nov 7 15:09:01 CET 2008.
--------
--- GNOME/gnome-main-menu/gnome-main-menu.changes 2008-10-22 18:59:57.000000000 +0200
+++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes 2008-11-07 00:15:03.000000000 +0100
@@ -1,0 +2,7 @@
+Thu Nov 6 17:06:13 CST 2008 - federico@novell.com
+
+- Added gnome-main-menu-bnc402256-leaks.diff to fix
+ https://bugzilla.novell.com/show_bug.cgi?id=402256 - memory leaks
+ while refreshing the list of recent documents.
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
New:
----
gnome-main-menu-bnc402256-leaks.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gnome-main-menu.spec ++++++
--- /var/tmp/diff_new_pack.O30734/_old 2008-11-07 15:08:37.000000000 +0100
+++ /var/tmp/diff_new_pack.O30734/_new 2008-11-07 15:08:37.000000000 +0100
@@ -27,7 +27,7 @@
Group: System/GUI/GNOME
AutoReqProv: on
Version: 0.9.11
-Release: 19
+Release: 20
Summary: The GNOME Desktop Menu
Source: %{name}-%{version}.tar.bz2
Source1: system-items-opensuse.xbel
@@ -35,6 +35,8 @@
Source3: gnome-session-shutdown.desktop
Patch1: FATE_303677.patch
Patch2: FATE_301986.patch
+# PATCH-FIX-UPSTREAM gnome-main-menu-bnc402256-leaks.diff bnc402256 federico@novell.com - Fixes for memory leaks
+Patch3: gnome-main-menu-bnc402256-leaks.diff
Url: http://www.gnome.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools
@@ -96,6 +98,7 @@
%setup -n gnome-main-menu-%{version}
%patch1 -p0
%patch2 -p1
+%patch3 -p1
cp -f %{S:1} main-menu/etc/system-items.xbel
%build
@@ -177,14 +180,18 @@
%{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la
%changelog
+* Thu Nov 06 2008 federico@novell.com
+- Added gnome-main-menu-bnc402256-leaks.diff to fix
+ https://bugzilla.novell.com/show_bug.cgi?id=402256 - memory leaks
+ while refreshing the list of recent documents.
* Wed Oct 22 2008 sreeves@suse.de
- Fix crash if trigger-panel-run-dialog is run from command line
* Mon Oct 13 2008 sreeves@suse.de
- Add option to show a "Run Application" entry - FATE#301986
disabled and hidden by default.
-* Sat Sep 27 2008 sreeves@suse.de
+* Fri Sep 26 2008 sreeves@suse.de
- Fix missing icon and tooltip from FATE#303677
-* Sat Sep 13 2008 sreeves@suse.de
+* Fri Sep 12 2008 sreeves@suse.de
- Show network documents in recent section - FATE#303677
- Move to 0.9.11
Port to gio
@@ -233,36 +240,36 @@
fix https://bugzilla.novell.com/show_bug.cgi?id=262334 - Main-menu
now shows the correct network status even if NetworkManager is not
running.
-* Thu Apr 24 2008 federico@suse.de
+* Wed Apr 23 2008 federico@suse.de
- Added gnome-main-menu-bnc380339-multiple-applet-crash.diff to fix
https://bugzilla.novell.com/show_bug.cgi?id=380339 - Crash when
there are multiple instances of main-menu in the panel.
-* Mon Apr 14 2008 sreeves@suse.de
+* Sun Apr 13 2008 sreeves@suse.de
- Update to 0.9.10
Rolls in all the patches since 0.9.9
Fix for NetworkManager API change - BNC#377019
-* Sat Apr 05 2008 federico@novell.com
+* Fri Apr 04 2008 federico@novell.com
- Added gnome-main-menu-bnc230478-bnc364186-bnc350662-performance.diff to fix these bugs:
https://bugzilla.novell.com/show_bug.cgi?id=230478 - pointless thumbnailing
https://bugzilla.novell.com/show_bug.cgi?id=364186 - main menu leaks
https://bugzilla.novell.com/show_bug.cgi?id=350662 - improved startup time
-* Sun Mar 16 2008 sreeves@suse.de
+* Sat Mar 15 2008 sreeves@suse.de
- Add missing requires to gnome-main-menu-devel package
(Fixes build failures of packages building with g-m-m-devel package)
* Thu Mar 06 2008 maw@suse.de
- #%%run_ldconfig#/sbin/ldconfig#.
* Thu Mar 06 2008 maw@suse.de
- Fix the build when against newer versions of intltool.
-* Thu Mar 06 2008 sreeves@suse.de
+* Wed Mar 05 2008 sreeves@suse.de
- upgrade to 0.9.9
-* Fri Feb 01 2008 jpr@suse.de
+* Thu Jan 31 2008 jpr@suse.de
- Add gnome-vfs2 as a BuildRequies, it was no longer being pulled
in implicitly
- Add gnome-main-menu-gnome-vfs-config.patch so the right cflags
are passed
* Mon Dec 24 2007 sreeves@suse.de
- Use NetworkManager 0.7
-* Tue Nov 06 2007 sreeves@suse.de
+* Mon Nov 05 2007 sreeves@suse.de
- Dont show lock screen option when logged in as root - BNC #136622
* Thu Oct 11 2007 sbrabec@suse.cz
- Removed bogus dependency on mDNSResponder.
@@ -272,18 +279,18 @@
- don't package -lang files in main package
* Wed Sep 19 2007 jimmyk@suse.de
- Ignore duplicate DBus messages from NetworkManager, BNC #307862.
-* Mon Sep 17 2007 jimmyk@suse.de
+* Sun Sep 16 2007 jimmyk@suse.de
- Added translations, BNC #308601.
- Reverted to system-monitor on hard drive click, BNC #287081, BNC #239001.
- Fixed .xbel file race, BNC #297641.
- Check for null function pointer before invoking, BNC #309330.
-* Fri Sep 14 2007 jimmyk@suse.de
+* Thu Sep 13 2007 jimmyk@suse.de
- Fixed build so as to break yast2-control-center, BNC #310128.
-* Fri Sep 07 2007 jimmyk@suse.de
+* Thu Sep 06 2007 jimmyk@suse.de
- Fixed system-item list to point to correct .desktop files, BNC #287082, BNC
[#302324].
- Added remote files to documents tab, BNC #239125.
-* Sat Aug 18 2007 jimmyk@suse.de
+* Fri Aug 17 2007 jimmyk@suse.de
- Logout item to use libssui, BNC #297998.
* Wed Aug 08 2007 maw@suse.de
- Use %%fdupes
@@ -295,7 +302,7 @@
Update to version 0.9.7
* Wed Mar 14 2007 lrupp@suse.de
- back to 0.6.3
-* Mon Mar 05 2007 jimmyk@suse.de
+* Sun Mar 04 2007 jimmyk@suse.de
- Remove unnecessary separators from context menus, BNC #240238.
- Properly display saved searches, BNC #246798.
* Wed Feb 28 2007 jimmyk@suse.de
@@ -306,16 +313,16 @@
- Fixed Categories (#242053).
* Thu Jan 11 2007 sbrabec@suse.cz
- Spec file cleanup.
-* Sat Dec 23 2006 maw@suse.de
+* Fri Dec 22 2006 maw@suse.de
- Move to /usr.
* Tue Nov 28 2006 sbrabec@suse.cz
- Build correctly in older products.
* Tue Nov 21 2006 mvidner@suse.cz
- Use package-manager instead of zen-updater (patch by jimmyk, BNC #222757#c6).
- Dropped recommends: zen-updater (BNC #222757#c14).
-* Tue Nov 21 2006 jimmyk@suse.de
+* Mon Nov 20 2006 jimmyk@suse.de
- Imported new translation files.
-* Wed Nov 08 2006 jimmyk@suse.de
+* Tue Nov 07 2006 jimmyk@suse.de
- Imported new translation files.
- Added "OnlyShowIn=GNOME" to the application-browser.desktop file, BNC #215192.
* Thu Nov 02 2006 rodrigo@suse.de
@@ -326,7 +333,7 @@
* Tue Oct 24 2006 sreeves@suse.de
- Fix for #214705 - AB/CC do not support menu layout hints.
Add missing header files to gnome-main-menu-devel
-* Tue Oct 24 2006 jimmyk@suse.de
+* Mon Oct 23 2006 jimmyk@suse.de
- Updated to work with both the ~/.recently-used.xbel and the old
~/.recently-used file formats. BNC #208368.
* Sun Oct 22 2006 aj@suse.de
@@ -369,7 +376,7 @@
sync from internal svn
- 2006-09-13 David Lodge
* configure.in: Added "en_GB" to ALL_LINGUAS.
-* Thu Aug 17 2006 jimmyk@suse.de
+* Wed Aug 16 2006 jimmyk@suse.de
- Sync'd hotfixes from the sles10 branch.
- Removed "Requires" dependency on zen-updater and disabled package management
functionality in package management software is not configured or present in
@@ -378,12 +385,12 @@
- buildrequire python-gtk-devel instead of python-gtk
* Tue Jun 27 2006 sreeves@suse.de
- Fix for 175645 - update po files to latest lcn for missing translations
-* Sat Jun 24 2006 jimmyk@suse.de
+* Fri Jun 23 2006 jimmyk@suse.de
- Added a patch to fix empty COPYING file, BNC #187871.
* Mon Jun 19 2006 sreeves@suse.de
- Fix for 175646 - error in Japanese po file
Fix for 177414 - more memory leaks
-* Mon Jun 19 2006 jimmyk@suse.de
+* Sun Jun 18 2006 jimmyk@suse.de
- Make the main-menu respect the /apps/nautilus/preferences/enable_delete key,
BNC #183636.
- Added functionality to remove entries from ~/.recently-used when a user
@@ -391,17 +398,17 @@
~/.recently-used when a user renames a file with the main-menu (BNC #183638).
Additionally, make the main-menu less naive about these operations if they
fail (BNC #185170).
-* Sat Jun 17 2006 jimmyk@suse.de
+* Fri Jun 16 2006 jimmyk@suse.de
- Added a keyboard grab to the main-menu, BNC #185462.
- Memory leak fixes, BNC #177414.
-* Sat Jun 10 2006 jimmyk@suse.de
+* Fri Jun 09 2006 jimmyk@suse.de
- main-menu/src/document-tile.c:
Switched the "Send To" trigger from using g_spawn_async with a full command
line as one string to using the argv array. This prevents the shell from
having to parse potentially problematic strings, BNC #183045.
Additionally, make the "Send To" menu option insensitive if the file is not
local, BNC #183190.
-* Sat Jun 03 2006 sreeves@suse.de
+* Fri Jun 02 2006 sreeves@suse.de
- More improvements for 180305 - AB crash when gconf key zero
* Thu Jun 01 2006 sreeves@suse.de
- Fix for 180305 - AB crash when gconf key newapps equals zero
@@ -417,10 +424,10 @@
information dialog uses a glade file from the NetworkManager package, this
patch ensures that the localization is taken from the NetworkManager domain
instead of the gnome-main-menu domain.
-* Wed May 31 2006 zsu@suse.de
+* Tue May 30 2006 zsu@suse.de
- bugzilla #179578. Load localized network connection dialog correctly
by using "NetworkManager" domain when creating glade object.
-* Tue May 23 2006 sreeves@suse.de
+* Mon May 22 2006 sreeves@suse.de
- Fix for 177807 - main menu crash
Partial fix for 175646 - added a translator comment to control-center.schemas.in
and applied patch to POTFILES.in
@@ -435,7 +442,7 @@
but unreported bug -- when dragging a launcher from outside the
main-menu onto a "Favorite App" that launcher was not added to the
Favorite Apps list.
-* Wed May 17 2006 jimmyk@suse.de
+* Tue May 16 2006 jimmyk@suse.de
- Fix for BNC #142932. Added file monitors to application tiles to turn
themselves on and off if the underlying .desktop file {dis,re}appears.
Added functionality to the TileTable widget in the main-menu to
@@ -446,7 +453,7 @@
* Fri May 05 2006 jimmyk@suse.de
- Fix for BNC #171114
Slab/Main Menu "blue" area excessively wide with long ESSIDs
-* Thu May 04 2006 jimmyk@suse.de
+* Wed May 03 2006 jimmyk@suse.de
- Fix for BNC #171100
Gnome Main Menu spacing
* Wed May 03 2006 jimmyk@suse.de
@@ -463,7 +470,7 @@
- Fix for 146557 - CC font cropping
* Wed Apr 19 2006 sbrabec@suse.cz
- Updated I18N patch (#157379).
-* Wed Apr 19 2006 jimmyk@suse.de
+* Tue Apr 18 2006 jimmyk@suse.de
- Fix for BNC #138730.
* Tue Apr 18 2006 sbrabec@suse.cz
- Updated translations: de, es, fi, fr, it, ja, pl, pt_BR, zh_CN,
@@ -480,7 +487,7 @@
* Mon Apr 10 2006 sbrabec@suse.cz
- Translations update.
- Devel dependencies update.
-* Wed Apr 05 2006 jimmyk@suse.de
+* Tue Apr 04 2006 jimmyk@suse.de
- Fix for BNC #163264, possible fix for BNC #162466, BNC #162920.
163264: gnome-main-menu crashes on resume from suspend-to-ram
162466: slab: crash
@@ -501,18 +508,18 @@
* Mon Mar 13 2006 jimmyk@suse.de
- Fix for 156846, 154780.
- Fix for BNC #139617.
-* Sat Mar 11 2006 jimmyk@suse.de
+* Fri Mar 10 2006 jimmyk@suse.de
- Removed beagle-gui dependency
- Fix for BNC #157166
-* Thu Mar 09 2006 jimmyk@suse.de
+* Wed Mar 08 2006 jimmyk@suse.de
- Fix network connection info dialog
- Added broken icon reloading for BNC #148034
-* Tue Mar 07 2006 jimmyk@suse.de
+* Mon Mar 06 2006 jimmyk@suse.de
- Change evolution-2.6.desktop to evolution.desktop
- Remove NM install dependency
-* Sat Mar 04 2006 jimmyk@suse.de
+* Fri Mar 03 2006 jimmyk@suse.de
- Fix for BNC #154440, #154266, #149735, update to new NM API
-* Wed Mar 01 2006 jimmyk@suse.de
+* Tue Feb 28 2006 jimmyk@suse.de
- Fix for BNC #152405
* Thu Feb 23 2006 jimmyk@suse.de
- Fix for multiple AB launches. Fix for BNC #152173.
@@ -520,7 +527,7 @@
- Fix filelist.
* Fri Feb 17 2006 gekker@suse.de
- Make names of menu in add to panel applet less confusing (#137006)
-* Fri Feb 17 2006 jimmyk@suse.de
+* Thu Feb 16 2006 jimmyk@suse.de
- Fix for BNC #150012, Fixes for the 2006-02-17 walkthrough.
* Wed Feb 15 2006 jimmyk@suse.de
- Fix for BNC #149031
@@ -530,7 +537,7 @@
- Fix for BNC #143115, BNC #146041
* Thu Feb 02 2006 joeshaw@suse.de
- Require beagle-gui, rather than beagle for correctness.
-* Tue Jan 31 2006 jpr@suse.de
+* Mon Jan 30 2006 jpr@suse.de
- Fix files list for new language
* Mon Jan 30 2006 jimmyk@suse.de
- Update to version 0.2.8
@@ -544,26 +551,26 @@
- Requires: holmes -> beagle, that code is in beagle now
* Mon Jan 09 2006 sreeves@suse.de
- Update to version 0.2.5
-* Fri Dec 23 2005 sreeves@suse.de
+* Thu Dec 22 2005 sreeves@suse.de
- Update to version 0.2.4
* Mon Dec 19 2005 jimmyk@suse.de
- Update to version 0.2.3
* Mon Dec 12 2005 sreeves@suse.de
- Fix for #138022 - app browser shown on startup
-* Sat Dec 10 2005 sreeves@suse.de
+* Fri Dec 09 2005 sreeves@suse.de
- Move to single click launch and singleton instance
* Fri Dec 09 2005 jimmyk@suse.de
- Update to version 0.2.0 (Recently Used Apps debut)
* Thu Dec 01 2005 jimmyk@suse.de
- Update to version 0.1.1
-* Wed Nov 23 2005 sreeves@suse.de
+* Tue Nov 22 2005 sreeves@suse.de
- install new apps schema
* Fri Nov 18 2005 jpr@suse.de
- Prequire gconf and filesystem
- Install schemas with makefile-install-rule
-* Thu Nov 17 2005 jimmyk@suse.de
+* Wed Nov 16 2005 jimmyk@suse.de
- Update to version 0.0.9
-* Tue Nov 15 2005 jpr@suse.de
+* Mon Nov 14 2005 jpr@suse.de
- Patch to default to best as the search tool for now
* Thu Nov 10 2005 gekker@suse.de
- Update to version 0.0.8
@@ -571,5 +578,5 @@
- Update to version 0.0.7
* Fri Oct 28 2005 gekker@suse.de
- Fix build on x86_64
-* Fri Oct 28 2005 gekker@suse.de
+* Thu Oct 27 2005 gekker@suse.de
- Initial import of package into autobuild, Version 0.0.6
++++++ gnome-main-menu-bnc402256-leaks.diff ++++++
bnc402256 - Fix memory leaks when refreshing the recent files list and bookmarks.
diff --git a/libslab/bookmark-agent.c b/libslab/bookmark-agent.c
index 47dc6bc..93efd23 100644
--- a/libslab/bookmark-agent.c
+++ b/libslab/bookmark-agent.c
@@ -1061,8 +1061,12 @@ create_app_item (BookmarkAgent *this, const gchar *uri)
else if (! libslab_strcmp (name, "Shutdown"))
g_bookmark_file_set_title (priv->store, uri, _("Shutdown"));
+ g_free (name);
+
if (libslab_strcmp (uri, uri_new))
g_bookmark_file_move_item (priv->store, uri, uri_new, NULL);
+
+ g_free (uri_new);
}
static void
@@ -1121,6 +1125,8 @@ create_doc_item (BookmarkAgent *this, const gchar *uri)
if (libslab_strcmp (uri, uri_new))
g_bookmark_file_move_item (priv->store, uri, uri_new, NULL);
+
+ g_free (uri_new);
}
static void
@@ -1204,6 +1210,8 @@ create_dir_item (BookmarkAgent *this, const gchar *uri)
if (uri_new && libslab_strcmp (uri, uri_new))
g_bookmark_file_move_item (priv->store, uri, uri_new, NULL);
+
+ g_free (uri_new);
}
static void
diff --git a/libslab/nameplate-tile.c b/libslab/nameplate-tile.c
index 23362e4..fc2f661 100644
--- a/libslab/nameplate-tile.c
+++ b/libslab/nameplate-tile.c
@@ -36,7 +36,6 @@ typedef struct
GtkContainer *image_ctnr;
GtkContainer *header_ctnr;
GtkContainer *subheader_ctnr;
- GtkTooltips *tooltips;
} NameplateTilePrivate;
#define NAMEPLATE_TILE_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), NAMEPLATE_TILE_TYPE, NameplateTilePrivate))
@@ -100,7 +99,6 @@ nameplate_tile_class_init (NameplateTileClass * this_class)
static void
nameplate_tile_init (NameplateTile * this)
{
- NAMEPLATE_TILE_GET_PRIVATE (this)->tooltips = NULL;
}
static GObject *
@@ -117,6 +115,12 @@ nameplate_tile_constructor (GType type, guint n_param, GObjectConstructParam * p
static void
nameplate_tile_finalize (GObject * g_object)
{
+ NameplateTile *np_tile;
+ NameplateTilePrivate *priv;
+
+ np_tile = NAMEPLATE_TILE (g_object);
+ priv = NAMEPLATE_TILE_GET_PRIVATE (np_tile);
+
(*G_OBJECT_CLASS (nameplate_tile_parent_class)->finalize) (g_object);
}
@@ -124,7 +128,7 @@ static void
nameplate_tile_get_property (GObject * g_object, guint prop_id, GValue * value,
GParamSpec * param_spec)
{
- GtkTooltipsData *tooltip;
+ char *tooltip;
NameplateTile *np_tile = NAMEPLATE_TILE (g_object);
switch (prop_id)
@@ -141,8 +145,9 @@ nameplate_tile_get_property (GObject * g_object, guint prop_id, GValue * value,
g_value_set_object (value, np_tile->subheader);
break;
case PROP_NAMEPLATE_TOOLTIP:
- tooltip = gtk_tooltips_data_get (GTK_WIDGET (np_tile));
- g_value_set_string (value, tooltip ? tooltip->tip_text : NULL);
+ tooltip = gtk_widget_get_tooltip_text (GTK_WIDGET (np_tile));
+ g_value_set_string (value, tooltip);
+ g_free (tooltip);
break;
default:
@@ -229,17 +234,7 @@ nameplate_tile_set_property (GObject * g_object, guint prop_id, const GValue * v
break;
case PROP_NAMEPLATE_TOOLTIP:
- if (tooltip) {
- if (! priv->tooltips)
- priv->tooltips = gtk_tooltips_new ();
-
- gtk_tooltips_set_tip (priv->tooltips, GTK_WIDGET(this), tooltip, tooltip);
- gtk_tooltips_enable(priv->tooltips);
- }
- else
- if (priv->tooltips)
- gtk_tooltips_disable(priv->tooltips);
-
+ gtk_widget_set_tooltip_text (GTK_WIDGET (this), tooltip);
break;
diff --git a/libslab/tile.c b/libslab/tile.c
index 0505c36..870944d 100644
--- a/libslab/tile.c
+++ b/libslab/tile.c
@@ -209,7 +209,7 @@ tile_finalize (GObject * g_object)
if (tile->uri)
g_free (tile->uri);
if (tile->context_menu)
- gtk_object_sink (GTK_OBJECT (tile->context_menu));
+ gtk_widget_destroy (GTK_WIDGET (tile->context_menu));
g_object_unref (priv->double_click_detector);
@@ -240,17 +240,34 @@ tile_get_property (GObject * g_obj, guint prop_id, GValue * value, GParamSpec *
static void
tile_set_property (GObject * g_obj, guint prop_id, const GValue * value, GParamSpec * param_spec)
{
+ Tile *tile;
+ GtkMenu *menu;
+
if (!IS_TILE (g_obj))
return;
+ tile = TILE (g_obj);
+
switch (prop_id)
{
case PROP_TILE_URI:
- TILE (g_obj)->uri = g_strdup (g_value_get_string (value));
+ tile->uri = g_strdup (g_value_get_string (value));
break;
case PROP_TILE_CONTEXT_MENU:
- TILE (g_obj)->context_menu = g_value_get_object (value);
+ menu = g_value_get_object (value);
+
+ if (menu == tile->context_menu)
+ break;
+
+ if (tile->context_menu)
+ gtk_menu_detach (tile->context_menu);
+
+ tile->context_menu = menu;
+
+ if (tile->context_menu)
+ gtk_menu_attach_to_widget (tile->context_menu, GTK_WIDGET (tile), NULL);
+
break;
default:
diff --git a/main-menu/src/main-menu-ui.c b/main-menu/src/main-menu-ui.c
index d212eef..0b0248c 100644
--- a/main-menu/src/main-menu-ui.c
+++ b/main-menu/src/main-menu-ui.c
@@ -1001,6 +1001,7 @@ setup_recently_used_store_monitor (MainMenuUI *this, gboolean is_startup)
path = get_recently_used_store_filename ();
file = g_file_new_for_path (path);
+ g_free (path);
monitor = g_file_monitor_file (file, 0, NULL, NULL);
if (monitor) {
@@ -1011,6 +1012,8 @@ setup_recently_used_store_monitor (MainMenuUI *this, gboolean is_startup)
this);
}
+ g_object_unref (file);
+
priv->recently_used_store_monitor = monitor;
if (priv->recently_used_timeout_id != 0)
diff --git a/main-menu/src/tile-table.c b/main-menu/src/tile-table.c
index 5b368e6..cbb6bdd 100644
--- a/main-menu/src/tile-table.c
+++ b/main-menu/src/tile-table.c
@@ -30,6 +30,7 @@ typedef struct {
BookmarkAgent *agent;
GList *tiles;
+ GtkSizeGroup *icon_size_group;
GtkBin **bins;
gint n_bins;
@@ -119,8 +120,6 @@ tile_table_reload (TileTable *this)
GtkWidget *tile;
gint n_tiles;
- GtkSizeGroup *icon_size_group;
-
GList *node;
gint i;
@@ -144,7 +143,8 @@ tile_table_reload (TileTable *this)
priv->tiles = NULL;
- icon_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
+ if (!priv->icon_size_group)
+ priv->icon_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
for (node = tiles; node; node = node->next) {
tile = GTK_WIDGET (node->data);
@@ -161,7 +161,7 @@ tile_table_reload (TileTable *this)
priv->tiles = g_list_append (priv->tiles, tile);
if (IS_NAMEPLATE_TILE (tile))
- gtk_size_group_add_widget (icon_size_group, NAMEPLATE_TILE (tile)->image);
+ gtk_size_group_add_widget (priv->icon_size_group, NAMEPLATE_TILE (tile)->image);
}
g_list_free (tiles);
@@ -343,6 +343,9 @@ finalize (GObject *g_obj)
{
TileTablePrivate *priv = PRIVATE (g_obj);
+ if (priv->icon_size_group)
+ g_object_unref (priv->icon_size_group);
+
g_free (priv->bins);
G_OBJECT_CLASS (tile_table_parent_class)->finalize (g_obj);
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org