Wikia

Sawfish

Update desktop file (again)

773pages on
this wiki
Talk0
Browse all patches

Author Edit

Christopher Bratusek

Synopsis Edit

Recent versions of gnome-window-properties don't run sawfish-ui, because of the out-dated desktop file.

This patch will also replace the capplet, which can then be safely removed from trunk.

For GNOME-Session 2.23 this desktop file is also used, to set the default window-manager, via the

/desktop/gnome/session/required-components/windowmanager

gconf-key, since some user might think {s,}he has to set the value to the binary-name, we should rename the file from "Sawfish.desktop" to "sawfish.desktop", for consistency and to avoid confusion.

Patch testing Edit

  1. Copy/paste the patch listed below into some file, eg. TEST.diff.
  2. If you don't have sawfish sources yet, have one, as described get it from GIT repo.
  3. Go into the directory where sawfish sources reside, eg. cd sawfish
  4. Test if the patch applies cleanly with this command:
    patch -p1 --ignore-whitespace --dry-run < TEST.diff
    in case of problems try also: -p0 or -p2
  5. If it applies cleanly, then remove the --dry-run from above command and run it again, otherwise ask on the mailing list.
  6. Compile sawfish: ./autogen.sh && make
  7. Install it for testing, but it depends on your linux distribution.
    1. It is always better to install sawfish as your distribution package, but it is different for each distribution.
    2. So you may try make install, which will install sawifish in /usr/local/share/sawfish/ (if you have write access). But then make sure that you run the correct version and delete it from that directory afterwards, to avoid any conflicts.
  8. Se also

PS: edit this template if you feel that those instructions can be improved.

Patch Edit

Index: Sawfish.desktop
===================================================================
--- Sawfish.desktop     (Revision 4228)
+++ Sawfish.desktop     (Arbeitskopie)
@@ -11,8 +11,9 @@
 Exec=sawfish
 TryExec=sawfish
 Terminal=false
+X-GNOME-WMName=Sawfish
+ConfigExec=sawfish-ui
+ConfigTryExec=sawfish-ui

 [Window Manager]
-ConfigExec=sawfish-ui
-ConfigTryExec=sawfish-ui
 SessionManaged=true

change name Sawfish.desktop to sawfish.desktop, svn mv Sawfish.desktop sawfish.desktop and update Makefile.in and sawfish.spec.in

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 4249)
+++ Makefile.in	(revision 4250)
@@ -47,7 +47,7 @@
 	  $(INSTALL_DATA) $$f $(DESTDIR)$(sawfishexecdir); \
 	done
 	rm -f $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties/Sawmill.desktop
-	$(INSTALL_DATA) $(srcdir)/Sawfish.desktop \
+	$(INSTALL_DATA) $(srcdir)/sawfish.desktop \
 	  $(DESTDIR)$(GNOMEDIR)/share/gnome/wm-properties
 	-for f in $(OLD_BINARIES); do \
 	  if [ -x $(DESTDIR)$(bindir)/$$f ]; then \
Index: sawfish.spec.in
===================================================================
--- sawfish.spec.in	(revision 4249)
+++ sawfish.spec.in	(revision 4250)
@@ -70,7 +70,7 @@
 %{_datadir}/sawfish/%{version}
 %{_datadir}/locale
 #%{_datadir}/control-center-2.0/capplets
-%{_datadir}/gnome/wm-properties/Sawfish.desktop
+%{_datadir}/gnome/wm-properties/sawfish.desktop
 %{_datadir}/pixmaps/sawfish*.png
 %{_libexecdir}/sawfish/%{version}/%{_target_platform}
 %{_libexecdir}/rep/%{_target_platform}/sawfish

and remove capplet:

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 4253)
+++ Makefile.in	(revision 4254)
@@ -27,7 +27,7 @@
 
 SUBDIRS = @SUBDIRS@
 
-OLD_BINARIES = sawmill sawmill-client sawmill-capplet sawmill-ui
+OLD_BINARIES = sawmill sawmill-client sawmill-ui
 
 all : build.h DOC NEWS FAQ
 	for dir in $(SUBDIRS); do \
Index: sawfish.spec.in
===================================================================
--- sawfish.spec.in	(revision 4253)
+++ sawfish.spec.in	(revision 4254)
@@ -69,7 +69,6 @@
 %{_bindir}/sawfish-ui
 %{_datadir}/sawfish/%{version}
 %{_datadir}/locale
-#%{_datadir}/control-center-2.0/capplets
 %{_datadir}/gnome/wm-properties/sawfish.desktop
 %{_datadir}/pixmaps/sawfish*.png
 %{_libexecdir}/sawfish/%{version}/%{_target_platform}
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 4253)
+++ po/POTFILES.in	(revision 4254)
@@ -1,4 +1,3 @@
-capplet/sawmill-capplet.c
 lisp/sawfish/gtk/widgets/alist.jl
 lisp/sawfish/gtk/widgets/color.jl
 lisp/sawfish/gtk/widgets/file.jl
Index: configure.in
===================================================================
--- configure.in	(revision 4253)
+++ configure.in	(revision 4254)
@@ -248,15 +248,6 @@
     AC_DEFINE(HAVE_ESD)
 fi
 
-AC_ARG_ENABLE(capplet,
- [  --enable-capplet	  Build the sawfish GNOME capplet [default]
-  --disable-capplet	  Don't built the capplet], [],
- [enable_capplet=no])
-
-if test "$enable_capplet" = "yes"; then
-  add_subdir "capplet"
-fi
-
 AC_ARG_ENABLE(gnome-widgets,
  [  --enable-gnome-widgets  Use GNOME widgets in places [default]
   --disable-gnome-widgets Don't use GNOME widgets], [],

Community's reasons for inclusion or rejection Edit

Patch submitters, please vote also! Yes, obviosuly your vote will be positive, but it's the place to give your explanation why this patch is good for all Sawfish users, and why it is correct - good reasons for inclusion.

When voting anonymously please write your name, so that it can be associated with your posts on the mailing list. If you are logged in you can sign yourself by typing four tilda characters: ~~~~.

  • Yes vote: yes., No vote: no. or Wtf vote: pondering. - no votes yet...
  • Yes vote: yes. Authors Comment: Fixes on issue (sawfish-ui to be run from gnome-window-properties) and removes the obsolete capplet, two advantages at once, should be commited. Flashrider [Christopher Bratusek] 11:09, 29 July 2008 (UTC)
  • Yes vote: yes. Applied, thanks. Janek Kozicki 11:36, 4 August 2008 (UTC)

Around Wikia's network

Random Wiki