rpms/xfdesktop/devel xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch, NONE, 1.1 xfdesktop-4.4.2-fix-size-warning-amd64.patch, NONE, 1.1 xfdesktop-4.4.2-simplify-free-code.patch, NONE, 1.1 xfdesktop-4.4.2-xdg-userdir-compat.patch, NONE, 1.1 xfdesktop.spec, 1.23, 1.24
Christoph Wickert
cwickert at fedoraproject.org
Wed Aug 27 18:30:32 UTC 2008
- Previous message (by thread): rpms/alpine/EL-4 .cvsignore, 1.3, 1.4 alpine.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message (by thread): rpms/alpine/EL-5 .cvsignore, 1.3, 1.4 alpine.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: cwickert
Update of /cvs/pkgs/rpms/xfdesktop/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv5334
Modified Files:
xfdesktop.spec
Added Files:
xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch
xfdesktop-4.4.2-fix-size-warning-amd64.patch
xfdesktop-4.4.2-simplify-free-code.patch
xfdesktop-4.4.2-xdg-userdir-compat.patch
Log Message:
* Wed Aug 27 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.2-5
- Use Fedora icon for desktop menu plugin (#445986)
- Respect xdg user directory paths (#457740)
- Fix menu icons
- Fix CRITICAL register message on startup
- Fix for x86_64
- Simplify g_list_free code
xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch:
--- NEW FILE xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch ---
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);
xfdesktop-4.4.2-fix-size-warning-amd64.patch:
--- NEW FILE xfdesktop-4.4.2-fix-size-warning-amd64.patch ---
Index: xfce_4_4/src/xfdesktop-icon-view.c
===================================================================
--- xfce_4_4/src/xfdesktop-icon-view.c (revision 26630)
+++ xfce_4_4/src/xfdesktop-icon-view.c (revision 26631)
@@ -1202,7 +1202,7 @@
if(target == GDK_NONE)
return FALSE;
}
- DBG("target=%d (%s)", (gint)target, gdk_atom_name(target));
+ DBG("target=%ld (%s)", (glong)target, gdk_atom_name(target));
xfdesktop_xy_to_rowcol(icon_view, x, y, &row, &col);
icon_on_dest = xfdesktop_icon_view_icon_in_cell(icon_view, row, col);
@@ -1698,7 +1698,7 @@
} else
icon_view->priv->grid_layout = g_malloc0(new_size);
- DBG("created grid_layout with %d positions", new_size/sizeof(gpointer));
+ DBG("created grid_layout with %ld positions", new_size/sizeof(gpointer));
DUMP_GRID_LAYOUT(icon_view);
xfdesktop_icon_view_setup_grids_xinerama(icon_view);
xfdesktop-4.4.2-simplify-free-code.patch:
--- NEW FILE xfdesktop-4.4.2-simplify-free-code.patch ---
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;
}
xfdesktop-4.4.2-xdg-userdir-compat.patch:
--- NEW FILE xfdesktop-4.4.2-xdg-userdir-compat.patch ---
diff -Naurp xfdesktop-4.4.2.bak/src/xfce-desktop.c xfdesktop-4.4.2/src/xfce-desktop.c
--- xfdesktop-4.4.2.bak/src/xfce-desktop.c 2007-11-17 20:31:41.000000000 +0100
+++ xfdesktop-4.4.2/src/xfce-desktop.c 2008-08-08 04:06:35.000000000 +0200
@@ -154,6 +154,7 @@ static void
xfce_desktop_setup_icon_view(XfceDesktop *desktop)
{
XfdesktopIconViewManager *manager = NULL;
+ gboolean wasUserDesktopFound = TRUE;
switch(desktop->priv->icons_style) {
case XFCE_DESKTOP_ICON_STYLE_NONE:
@@ -168,9 +169,12 @@ xfce_desktop_setup_icon_view(XfceDesktop
case XFCE_DESKTOP_ICON_STYLE_FILES:
{
ThunarVfsPath *path;
- gchar *desktop_path = xfce_get_homefile("Desktop",
- NULL);
-
+ const gchar *desktop_path = g_get_user_special_dir(G_USER_DIRECTORY_DESKTOP);
+
+ if (G_UNLIKELY (desktop_path == NULL)) {
+ gchar *desktop_path = xfce_get_homefile("Desktop", NULL);
+ wasUserDesktopFound = FALSE;
+ }
path = thunar_vfs_path_new(desktop_path, NULL);
if(path) {
XfceRc *rcfile;
@@ -219,7 +223,8 @@ xfce_desktop_setup_icon_view(XfceDesktop
g_critical("Unable to create ThunarVfsPath for '%s'",
desktop_path);
}
- g_free(desktop_path);
+ if (wasUserDesktopFound == FALSE)
+ g_free(desktop_path);
}
break;
#endif
Index: xfdesktop.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xfdesktop/devel/xfdesktop.spec,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- xfdesktop.spec 26 Aug 2008 19:41:06 -0000 1.23
+++ xfdesktop.spec 27 Aug 2008 18:30:01 -0000 1.24
@@ -18,6 +18,14 @@
Patch4: xfdesktop-4.4.2-desktop-menu-fixes.patch
# Enable distro specific logo in desktop menu
Patch5: xfdesktop-4.4.2-desktop-menu-icon.patch
+# Fix CRITICAL register message
+Patch6: xfdesktop-4.4.2-fix-CRITICAL-register-message-startup.patch
+# simplify free code
+Patch7: xfdesktop-4.4.2-simplify-free-code.patch
+# Fix for x86_64
+Patch8: xfdesktop-4.4.2-fix-size-warning-amd64.patch
+# Enable xdg user dirs
+Patch9: xfdesktop-4.4.2-xdg-userdir-compat.patch
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -51,6 +59,10 @@
%patch3 -p1 -b .memleak
%patch4 -p1 -b .fixed
%patch5 -p1 -b .distro-logo
+%patch6 -p1 -b .critical
+%patch7 -p1 -b .simplyfied
+%patch8 -p1 -b .x86_64
+%patch9 -p1 -b .userdir
%build
%configure
@@ -96,9 +108,13 @@
%{_mandir}/man1/*
%changelog
-* Tue Aug 26 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.2-5
+* Wed Aug 27 2008 Christoph Wickert <fedora christoph-wickert de> - 4.4.2-5
- Use Fedora icon for desktop menu plugin (#445986)
+- Respect xdg user directory paths (#457740)
- Fix menu icons
+- Fix CRITICAL register message on startup
+- Fix for x86_64
+- Simplify g_list_free code
* Mon Aug 11 2008 Kevin Fenzi <kevin at tummy.com> - 4.4.2-4
- Add partial memory leak patch (partially fixes #428662)
- Previous message (by thread): rpms/alpine/EL-4 .cvsignore, 1.3, 1.4 alpine.spec, 1.3, 1.4 sources, 1.3, 1.4
- Next message (by thread): rpms/alpine/EL-5 .cvsignore, 1.3, 1.4 alpine.spec, 1.3, 1.4 sources, 1.3, 1.4
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list