rpms/lxsession-edit/devel lxsession-edit-0.1.1-new-config-file.patch, NONE, 1.1 lxsession-edit.spec, 1.6, 1.7

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxsession-edit/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31596

Modified Files:
	lxsession-edit.spec 
Added Files:
	lxsession-edit-0.1.1-new-config-file.patch 
Log Message:
* Sun Jan 31 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-4
- Support new config file format


lxsession-edit-0.1.1-new-config-file.patch:
 lxsession-edit.c |   15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

--- NEW FILE lxsession-edit-0.1.1-new-config-file.patch ---
--- trunk/lxsession-edit/src/lxsession-edit.c	2009/07/12 17:46:05	1797
+++ trunk/lxsession-edit/src/lxsession-edit.c	2009/07/14 05:29:52	1812
@@ -28,6 +28,8 @@
 #include <stdio.h>
 #include <string.h>
 
+#define CONFIG_FILE_NAME	"desktop.conf"
+
 enum {
     COL_ENABLED,
     COL_ICON,
@@ -46,7 +48,7 @@
     ORIGINALLY_ENABLED = 1 << 15
 };
 
-static char* session_name = "LXDE";
+static const char* session_name = NULL;
 static GtkListStore* autostart_list = NULL;
 static const char grp[] = "Desktop Entry";
 
@@ -391,6 +393,11 @@
     gtk_init( &argc, &argv );
     if( argc > 1 )
         session_name = argv[1];
+	else
+		session_name = g_getenv("DESKTOP_SESSION");
+	
+	if( G_UNLIKELY(!session_name) )
+		session_name = "LXDE";
 
     builder = gtk_builder_new();
     if( !gtk_builder_add_from_file( builder, PACKAGE_DATA_DIR "/lxsession-edit/lxsession-edit.ui", NULL ) )
@@ -414,7 +421,7 @@
     {
         /* wm settings (only show this when we are under lxsession) */
         kf = g_key_file_new();
-        cfg = g_build_filename( g_get_user_config_dir(), "lxsession", session_name, "config", NULL );
+        cfg = g_build_filename( g_get_user_config_dir(), "lxsession", session_name, CONFIG_FILE_NAME, NULL );
         loaded = g_key_file_load_from_file(kf, cfg, 0, NULL);
         if( !loaded )
         {
@@ -423,7 +430,7 @@
             g_free(cfg);
             for( dir = dirs; *dir; ++dir )
             {
-                cfg = g_build_filename( *dir, "lxsession", session_name, "config", NULL );
+                cfg = g_build_filename( *dir, "lxsession", session_name, CONFIG_FILE_NAME, NULL );
                 loaded = g_key_file_load_from_file(kf, cfg, 0, NULL);
                 g_free( cfg );
                 if( loaded )
@@ -437,7 +444,7 @@
         {
             g_free(wm_cmd);
             /* If it's our favorite, LXDE */
-            if( strcmp(g_getenv("DESKTOP_SESSION"), "LXDE") == 0 )
+            if( strcmp(session_name, "LXDE") == 0 )
                 wm_cmd = g_strdup("openbox-lxde");
             else
                 wm_cmd = g_strdup("openbox");


Index: lxsession-edit.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxsession-edit/devel/lxsession-edit.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lxsession-edit.spec	23 Nov 2009 00:56:32 -0000	1.6
+++ lxsession-edit.spec	31 Jan 2010 01:48:55 -0000	1.7
@@ -1,6 +1,6 @@
 Name:           lxsession-edit
 Version:        0.1.1
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Simple GUI to configure what’s automatically started in LXDE
 
 Group:          User Interface/Desktops
@@ -8,10 +8,12 @@ License:        GPLv2+
 URL:            http://lxde.org
 Source0:        http://downloads.sourceforge.net/lxde/%{name}-%{version}.tar.gz
 Patch0:         %{name}-0.1.1-desktop-file.patch
+# http://lxde.svn.sourceforge.net/viewvc/lxde/trunk/lxsession-edit/src/lxsession-edit.c?r1=1797&r2=1812
+Patch1:         %{name}-0.1.1-new-config-file.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel, desktop-file-utils, gettext
-Requires:       lxsession
+Requires:       lxsession >= 0.4.0
 
 %description
 LXSession-edit is a tool to manage freedesktop.org compliant desktop session 
@@ -22,6 +24,7 @@ is not yet available, but it will be sup
 %prep
 %setup -q
 %patch0 -p1 -b .fixes
+%patch1 -p2 -b .old
 
 
 %build
@@ -54,7 +57,10 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Mon Nov 23 2009 Christoph Wickert <fedora christoph-wickert de> - 0.1.1-3
+* Sun Jan 31 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-4
+- Support new config file format
+
+* Mon Nov 23 2009 Christoph Wickert <cwickert at fedoraproject.org> - 0.1.1-3
 - Workaround for infinite loop that causes FTBFS (#539206)
 
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.1.1-2