rpms/lxlauncher/F-13 lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch, NONE, 1.1 lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch, NONE, 1.1 lxlauncher.spec, 1.6, 1.7

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/lxlauncher/F-13
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4835/F-13

Modified Files:
	lxlauncher.spec 
Added Files:
	lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch 
	lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch 
Log Message:
* Sun Feb 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.1-5
- Fix for the new behavior of menu-cache 0.3.0


lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch:
 lxlauncher.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

--- NEW FILE lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch ---
>From cb99b126dd90a8460c5bd4a837fdb7505658ba52 Mon Sep 17 00:00:00 2001
From: martyj19 <martyj19 at comcast.net>
Date: Mon, 13 Jul 2009 16:46:09 +0000
Subject: [PATCH 02/50] Fix SUSE lint warnings

---
 src/lxlauncher.c |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/src/lxlauncher.c b/src/lxlauncher.c
index 7dab830..034d308 100644
--- a/src/lxlauncher.c
+++ b/src/lxlauncher.c
@@ -311,6 +311,7 @@ static gboolean on_scroll( GtkAdjustment* adj, PageData* data )
 {
     // Dirty hacks used to force pseudo-transparent background
     gtk_widget_queue_draw( data->table );
+    return TRUE;
 }
 
 // Dirty hacks used to reduce unnecessary redrew during scroll
@@ -674,6 +675,7 @@ gchar* get_xdg_config_file(const char *name) {
 	}
 	free(file);
     }
+    return NULL;
 }
 
 int main(int argc, char** argv)
-- 
1.6.6


lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch:
 lxlauncher.c |   68 ++++++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 47 insertions(+), 21 deletions(-)

--- NEW FILE lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch ---
>From a7dad81b883a783bc1ac4f8092a1571b7f843914 Mon Sep 17 00:00:00 2001
From: Hong Jen Yee (PCMan) <pcman.tw at gmail.com>
Date: Wed, 17 Feb 2010 22:42:01 +0800
Subject: [PATCH 50/50] Fix for the new behavior of libmenu-cache 0.3 series.

---
 src/lxlauncher.c |   67 +++++++++++++++++++++++++++++++++++++----------------
 1 files changed, 47 insertions(+), 20 deletions(-)

diff --git a/src/lxlauncher.c b/src/lxlauncher.c
index 6dfbbc9..3a39bc6 100644
--- a/src/lxlauncher.c
+++ b/src/lxlauncher.c
@@ -663,21 +663,40 @@ gchar* get_xdg_config_file(const char *name) {
     gchar *file;
 
     file = g_build_filename(user_dir, name, NULL);
-    if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) {
-	return file;
-    }
+    if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE)
+    	return file;
     free(file);
 
     for (dir = system_dirs; *dir; ++dir ) {
-	file = g_build_filename(*dir, name, NULL);
-	if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE) {
-	    return file;
-	}
-	free(file);
+        file = g_build_filename(*dir, name, NULL);
+        if (g_file_test(file, G_FILE_TEST_EXISTS) == TRUE)
+            return file;
+	    free(file);
     }
     return NULL;
 }
 
+static void on_menu_cache_reload(MenuCache* mc, gpointer user_data)
+{
+    GMainLoop* mainloop = (GMainLoop*)user_data;
+    g_main_loop_quit(mainloop);
+}
+
+MenuCache* _menu_cache_lookup_sync( const char* menu_name )
+{
+    MenuCache* mc = menu_cache_lookup(menu_name);
+    /* ensure that the menu cache is loaded */
+    if(! menu_cache_get_root_dir(mc)) /* if it's not yet loaded */
+    {
+        GMainLoop* mainloop = g_main_loop_new(NULL, FALSE);
+        gpointer notify_id = menu_cache_add_reload_notify(mc, on_menu_cache_reload, mainloop);
+        g_main_loop_run(mainloop);
+        g_main_loop_unref(mainloop);
+        menu_cache_remove_reload_notify(mc, notify_id);
+    }
+    return mc;
+}
+
 int main(int argc, char** argv)
 {
     int i;
@@ -697,13 +716,14 @@ int main(int argc, char** argv)
     GError *error = NULL;
     gchar *config_file = get_xdg_config_file(CONFIG_FILE);
     if (config_file &&
-	g_key_file_load_from_file(key_file,
-				  config_file,
-				  G_KEY_FILE_NONE,
-				  &error)) {
-	printf("Loaded %s\n", config_file);
-    } else {
-	perror("Error loading " CONFIG_FILE);
+        g_key_file_load_from_file(key_file,
+                      config_file,
+                      G_KEY_FILE_NONE,
+                      &error)) {
+    	printf("Loaded %s\n", config_file);
+    }
+    else {
+    	perror("Error loading " CONFIG_FILE);
     }
     if (config_file)
 	free(config_file);
@@ -719,15 +739,17 @@ int main(int argc, char** argv)
     gchar* gtkrc_file = get_xdg_config_file("lxlauncher/gtkrc");
     gtk_rc_parse(gtkrc_file);
     if (gtkrc_file) {
-	free(gtkrc_file);
+    	free(gtkrc_file);
     }
 
     button_size = g_key_file_get_integer(key_file, "Main", "BUTTON_SIZE", NULL);
     img_size = g_key_file_get_integer(key_file, "Main", "IMG_SIZE", NULL);
 
     // to prevent from going without configure file
-    if(!button_size) button_size = BUTTON_SIZE_FALLBACK;
-    if(!img_size) img_size = IMG_SIZE_FALLBACK;
+    if(!button_size)
+        button_size = BUTTON_SIZE_FALLBACK;
+    if(!img_size)
+        img_size = IMG_SIZE_FALLBACK;
 
     icon_size = gtk_icon_size_register( "ALIcon", img_size, img_size );
 
@@ -758,9 +780,14 @@ int main(int argc, char** argv)
     gtk_container_add( (GtkContainer*)main_window, notebook );
 
     g_setenv("XDG_MENU_PREFIX", "lxlauncher-", TRUE);
-    menu_tree = menu_cache_lookup( "applications.menu" );
+    menu_tree = _menu_cache_lookup_sync( "applications.menu" );
+    if(!menu_tree)
+    {
+        g_print("Unable to load application menu\n");
+        return 1;
+    }
+    root_dir = menu_cache_item_ref(menu_cache_get_root_dir( menu_tree ));
     reload_notify_id = menu_cache_add_reload_notify( menu_tree, on_menu_tree_changed, NULL );
-    root_dir = menu_cache_ref(menu_cache_get_root_dir( menu_tree ));
 
     create_notebook_pages();
 
-- 
1.6.6



Index: lxlauncher.spec
===================================================================
RCS file: /cvs/pkgs/rpms/lxlauncher/F-13/lxlauncher.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- lxlauncher.spec	17 Feb 2010 12:39:44 -0000	1.6
+++ lxlauncher.spec	21 Feb 2010 22:39:49 -0000	1.7
@@ -1,13 +1,18 @@
 Name:           lxlauncher
 Version:        0.2.1
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        Open source replacement for Launcher on the EeePC
 
 Group:          User Interface/Desktops
 License:        GPLv2+
 URL:            http://lxde.org/
 Source0:        http://downloads.sourceforge.net/sourceforge/lxde/%{name}-%{version}.tar.gz
-Patch0:         lxlauncher-0.2.1-dsofix.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxlauncher;a=commit;h=cb99b126dd90a8460c5bd4a837fdb7505658ba52
+Patch0:         lxlauncher-0.2.1-fix-SUSE-lint-warnings.patch
+# http://lxde.git.sourceforge.net/git/gitweb.cgi?p=lxde/lxlauncher;a=commit;h=a7dad81b883a783bc1ac4f8092a1571b7f843914
+Patch1:         lxlauncher-0.2.1-fix-for-the-new-behavior-of-libmenu-cache-0.3-series.patch
+# fixes https://bugzilla.redhat.com/show_bug.cgi?id=565072
+Patch2:         lxlauncher-0.2.1-dsofix.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.12 startup-notification-devel
@@ -23,13 +28,13 @@ LXLauncher is part of LXDE, the Lightwei
 
 %prep
 %setup -q
-%patch0 -p1 -b .dsofix
+%patch0 -p1 -b .suse-lint
+%patch1 -p1 -b .menu-cache-0.3.0
+%patch2 -p1 -b .dsofix
 
 
 %build
 %configure
-# workaround for FTBFS #539147
-touch -r po/Makefile po/stamp-it
 make %{?_smp_mflags}
 
 
@@ -59,6 +64,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Sun Feb 21 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.1-5
+- Fix for the new behavior of menu-cache 0.3.0
+
 * Wed Feb 17 2010 Christoph Wickert <cwickert at fedoraproject.org> - 0.2.1-4
 - Add patch to fix DSO linking (#565072)