[Pkg-xfce-commits] r2484 - in desktop/trunk/xfdesktop4/debian: . patches
corsac at alioth.debian.org
corsac at alioth.debian.org
Tue Oct 28 13:58:36 UTC 2008
Author: corsac
Date: 2008-10-28 13:58:36 +0000 (Tue, 28 Oct 2008)
New Revision: 2484
Removed:
desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch
desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch
desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch
desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch
Modified:
desktop/trunk/xfdesktop4/debian/changelog
desktop/trunk/xfdesktop4/debian/patches/series
Log:
- italian typos fixed closes: #483709
- 03_fix-memory-leak dropped, merged upstream.
- 04_fix-CRITICAL-register-message-startup.patch too.
- 05_simplify-free-code as well.
Modified: desktop/trunk/xfdesktop4/debian/changelog
===================================================================
--- desktop/trunk/xfdesktop4/debian/changelog 2008-10-28 13:58:28 UTC (rev 2483)
+++ desktop/trunk/xfdesktop4/debian/changelog 2008-10-28 13:58:36 UTC (rev 2484)
@@ -1,15 +1,18 @@
xfdesktop4 (4.4.3-1) UNRELEASED; urgency=low
* new upstream bugfix release
+ - italian typos fixed closes: #483709
* debian/patches:
- - 07_fix-italian-typos added, thanks David Paleino. closes: #483709
+ - 03_fix-memory-leak dropped, merged upstream.
+ - 04_fix-CRITICAL-register-message-startup.patch too.
+ - 05_simplify-free-code as well.
* debian/control:
- updated standards version to 3.8.0. No change needed.
- update description based on xfce.org one.
* debian/rules:
- stop messing with config.{guess,sub}.
- -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 07:39:36 +0100
+ -- Yves-Alexis Perez <corsac at debian.org> Tue, 28 Oct 2008 13:49:13 +0100
xfdesktop4 (4.4.2-7) unstable; urgency=low
Deleted: desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch 2008-10-28 13:58:28 UTC (rev 2483)
+++ desktop/trunk/xfdesktop4/debian/patches/03_fix-memory-leak.patch 2008-10-28 13:58:36 UTC (rev 2484)
@@ -1,34 +0,0 @@
-Index: xfce_4_4/modules/menu/desktop-menu-dentry.c
-===================================================================
---- xfce_4_4/modules/menu/desktop-menu-dentry.c (revision 26634)
-+++ xfce_4_4/modules/menu/desktop-menu-dentry.c (revision 26635)
-@@ -173,6 +173,7 @@
- if(cmpname && g_ascii_strcasecmp(name, cmpname) < 0)
- break;
- }
-+ g_list_free(items);
-
- gtk_menu_shell_insert(menu_shell, mi, i);
-
-Index: xfce_4_4/modules/menu/desktop-menuspec.c
-===================================================================
---- xfce_4_4/modules/menu/desktop-menuspec.c (revision 26651)
-+++ xfce_4_4/modules/menu/desktop-menuspec.c (revision 26652)
-@@ -203,7 +203,7 @@
- else
- foundcat = NULL;
- if(!foundcat) {
-- g_ptr_array_free(revpath, FALSE);
-+ g_ptr_array_free(revpath, TRUE);
- revpath = NULL;
- break;
- }
-@@ -220,7 +220,7 @@
- newpath[totlen] = 0;
-
- g_ptr_array_add(mtfpi->paths, newpath);
-- g_ptr_array_free(revpath, FALSE);
-+ g_ptr_array_free(revpath, TRUE);
- }
- }
- }
Deleted: desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch 2008-10-28 13:58:28 UTC (rev 2483)
+++ desktop/trunk/xfdesktop4/debian/patches/04_fix-CRITICAL-register-message-startup.patch 2008-10-28 13:58:36 UTC (rev 2484)
@@ -1,15 +0,0 @@
-Index: xfdesktop/src/main.c
-===================================================================
---- xfdesktop/src/main.c (revision 26631)
-+++ xfdesktop/src/main.c (revision 26632)
-@@ -382,8 +382,8 @@
- windowlist_set_show_icons(desktop_gtk_menu_images);
-
- if(mcs_client) {
-- settings_register_callback(menu_settings_changed, NULL);
-- settings_register_callback(windowlist_settings_changed, NULL);
-+ settings_register_callback(menu_settings_changed, desktops[0]);
-+ settings_register_callback(windowlist_settings_changed, desktops[0]);
- }
-
- signal(SIGHUP, sighandler_cb);
Deleted: desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch 2008-10-28 13:58:28 UTC (rev 2483)
+++ desktop/trunk/xfdesktop4/debian/patches/05_simplify-free-code.patch 2008-10-28 13:58:36 UTC (rev 2484)
@@ -1,28 +0,0 @@
-Index: xfce_4_4/modules/menu/desktop-menu-cache.c
-===================================================================
---- xfce_4_4/modules/menu/desktop-menu-cache.c (revision 26650)
-+++ xfce_4_4/modules/menu/desktop-menu-cache.c (revision 26651)
-@@ -453,17 +453,11 @@
- menu_tree = NULL;
- }
-
-- for(l = menu_files; l; l = l->next)
-- g_free(l->data);
-- if(menu_files) {
-- g_list_free(menu_files);
-- menu_files = NULL;
-- }
-+ g_list_foreach(menu_files, (GFunc)g_free, NULL);
-+ g_list_free(menu_files);
-+ menu_files = NULL;
-
-- for(l = dentry_dirs; l; l = l->next)
-- g_free(l->data);
-- if(dentry_dirs) {
-- g_list_free(dentry_dirs);
-- dentry_dirs = NULL;
-- }
-+ g_list_foreach(dentry_dirs, (GFunc)g_free, NULL);
-+ g_list_free(dentry_dirs);
-+ dentry_dirs = NULL;
- }
Deleted: desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch 2008-10-28 13:58:28 UTC (rev 2483)
+++ desktop/trunk/xfdesktop4/debian/patches/07_fix-italian-typos.patch 2008-10-28 13:58:36 UTC (rev 2484)
@@ -1,14 +0,0 @@
---- xfdesktop/modules/menu/xfce-registered-categories.xml.it.old
-+++ xfdesktop/modules/menu/xfce-registered-categories.xml.it
-@@ -138,9 +138,9 @@
- <category name="HamRadio" replace="Ham Radio" builtin-icon="NETWORK" />
- <category name="News" builtin-icon="NETWORK" />
- <category name="P2P" replace="Peer-to-Peer" builtin-icon="NETWORK" />
-- <category name="RemoteAccess" replace="Accessa remoto" builtin-icon="NETWORK" />
-+ <category name="RemoteAccess" replace="Accesso remoto" builtin-icon="NETWORK" />
- <category name="Telephony" replace="Telefonia" builtin-icon="NETWORK" />
-- <category name="WebBrowser" replace="Naviagazione internet" builtin-icon="NETWORK" />
-+ <category name="WebBrowser" replace="Navigazione internet" builtin-icon="NETWORK" />
- <category name="WebDevelopment" replace="Sviluppo web" builtin-icon="NETWORK" />
- <category name="AudioVideo" replace="Multimedia" toplevel="true" builtin-icon="MULTIMEDIA">
- <subcategory name="HamRadio" />
Modified: desktop/trunk/xfdesktop4/debian/patches/series
===================================================================
--- desktop/trunk/xfdesktop4/debian/patches/series 2008-10-28 13:58:28 UTC (rev 2483)
+++ desktop/trunk/xfdesktop4/debian/patches/series 2008-10-28 13:58:36 UTC (rev 2484)
@@ -1,6 +1,2 @@
01_show-backdrop-by-default.patch
02_use_eject_where_needed.patch
-03_fix-memory-leak.patch
-04_fix-CRITICAL-register-message-startup.patch
-05_simplify-free-code.patch
-07_fix-italian-typos.patch
More information about the Pkg-xfce-commits
mailing list