[xchat-gnome/f15] Fix sm call to use our desktop file name.

Bill Nottingham notting at fedoraproject.org
Tue Aug 9 19:31:52 UTC 2011


commit 5c588e2b5c783563f2acb0b3546be522330e31cf
Author: Bill Nottingham <notting at redhat.com>
Date:   Tue Aug 9 15:30:02 2011 -0400

    Fix sm call to use our desktop file name.

 xchat-gnome-0.26.2-desktop-name.patch |   12 ++++++++++++
 xchat-gnome.spec                      |    3 +++
 2 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/xchat-gnome-0.26.2-desktop-name.patch b/xchat-gnome-0.26.2-desktop-name.patch
new file mode 100644
index 0000000..34ce00b
--- /dev/null
+++ b/xchat-gnome-0.26.2-desktop-name.patch
@@ -0,0 +1,12 @@
+diff -up xchat-gnome-0.26.2/src/fe-gnome/fe-gnome.c.foo xchat-gnome-0.26.2/src/fe-gnome/fe-gnome.c
+--- xchat-gnome-0.26.2/src/fe-gnome/fe-gnome.c.foo	2011-08-09 15:27:42.802160028 -0400
++++ xchat-gnome-0.26.2/src/fe-gnome/fe-gnome.c	2011-08-09 15:28:03.596159828 -0400
+@@ -1074,7 +1074,7 @@ setup_sm (gint argc, gchar *argv[])
+ 	gchar *desktop_file;
+ 
+ 	client = egg_sm_client_get ();
+-	desktop_file = g_build_filename (DATADIR, "applications", "xchat-gnome.desktop", NULL);
++	desktop_file = g_build_filename (DATADIR, "applications", "fedora-xchat-gnome.desktop", NULL);
+ 	egg_set_desktop_file (desktop_file);
+ 	g_free (desktop_file);
+ 
diff --git a/xchat-gnome.spec b/xchat-gnome.spec
index f4fe481..7de44ba 100644
--- a/xchat-gnome.spec
+++ b/xchat-gnome.spec
@@ -18,6 +18,8 @@ Source0:        http://ftp.gnome.org/pub/gnome/sources/%{name}/0.26/%{name}-%{ve
 Patch0:		xchat-gnome-0.23.92-config.patch
 # Patch for libnotify 0.70 (just drop one parameter from one function)
 Patch1:		xchat-gnome-0.26.1-libnotify.patch
+# Fix for our desktop file name
+Patch2:		xchat-gnome-0.26.2-desktop-name.patch
 # Patch to work with recent NetworkManager (0.7+)
 Patch10:        xchat-gnome-0.26.1-recent-network-manager.patch
 # Convert deprecated GDK functions to cairo
@@ -74,6 +76,7 @@ common settings will be included in the main user interface. .
 %setup -q -n %{name}-%{version}
 %patch0 -p1 -b .config
 %patch1 -p1 -b .notify
+%patch2 -p1 -b .desktop-name
 %patch10 -p1 -b .recent-nm
 %patch13 -p1 -b .gdk-deprecations
 %patch100 -p1 -b .empty


More information about the scm-commits mailing list