rpms/gnome-launch-box/devel glb-auto-transparent.patch, NONE, 1.1 glb-use-xdg-dirs.patch, NONE, 1.1 gnome-launch-box.spec, 1.8, 1.9

[Bastien Nocera (hadess)]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-launch-box/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24994

Modified Files:
	gnome-launch-box.spec 
Added Files:
	glb-auto-transparent.patch glb-use-xdg-dirs.patch 
Log Message:
* Wed Jan 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-6
- Add patches to use xdg-user-dirs and auto-detect transparency (#428079)


glb-auto-transparent.patch:

--- NEW FILE glb-auto-transparent.patch ---
Index: src/lb-main.c
===================================================================
--- src/lb-main.c	(revision 627)
+++ src/lb-main.c	(working copy)
@@ -36,14 +36,11 @@
 static LbModuleManager *manager = NULL;
 
 static gboolean no_window = FALSE;
-static gboolean transparent = FALSE;
 
 static GOptionEntry cmd_args[] = {
 
 	{ "no-default-window", 'n', 0, G_OPTION_ARG_NONE,
 	  &no_window, "Do not show the initial window", NULL},
-	{ "transparent", 't', 0, G_OPTION_ARG_NONE,
-	  &transparent, "Be fancy", NULL}
 };
 
 static void
@@ -52,9 +49,13 @@
 	static GtkWidget *window = NULL;
 
 	if (!manager) {
+		gboolean composited;
+
+		composited = gdk_screen_is_composited (gdk_screen_get_default ());
+
 		manager = g_object_new (LB_TYPE_MODULE_MANAGER,	NULL);
-		
-		window = lb_window_new (manager, transparent);
+
+		window = lb_window_new (manager, composited);
 		gtk_window_set_default_size (GTK_WINDOW (window), 300, -1);
 	}
 

glb-use-xdg-dirs.patch:

--- NEW FILE glb-use-xdg-dirs.patch ---
Index: src/lb-module-files.c
===================================================================
--- src/lb-module-files.c	(revision 627)
+++ src/lb-module-files.c	(working copy)
@@ -75,9 +75,7 @@
 {
 	GObjectClass  *object_class = G_OBJECT_CLASS (klass);
 	LbModuleClass *module_class = LB_MODULE_CLASS (klass);
-	GConfClient   *client;
-	gboolean       desktop_is_home;
-	gchar         *desktop;
+	const gchar   *desktop;
 	gchar         *uri;
 
 	parent_class = g_type_class_peek_parent (klass);
@@ -89,15 +87,11 @@
 	module_class->query        = module_files_query;
 	module_class->add_actions  = module_files_add_actions;
 
-	client = gconf_client_get_default();
-	desktop_is_home = gconf_client_get_bool(client, "/apps/nautilus/preferences/desktop_is_home_dir", NULL);
-
-	desktop = g_build_filename (g_get_home_dir (), desktop_is_home ? NULL : "Desktop", NULL);
+	desktop = g_get_user_special_dir (G_USER_DIRECTORY_DESKTOP);
+	if (desktop == NULL)
+		desktop = g_get_home_dir ();
 	uri = g_filename_to_uri (desktop, NULL, NULL);
-	g_free (desktop);
 
-	g_object_unref(client);
-
 	g_object_class_install_property (object_class, PROP_DIR_URI,
 					 g_param_spec_string ("dir-uri",
 							      NULL, NULL,
Index: configure.ac
===================================================================
--- configure.ac	(revision 627)
+++ configure.ac	(working copy)
@@ -44,6 +44,7 @@
 dnl -----------------------------------------------------------
 
 PKG_CHECK_MODULES(LB,[
+	glib-2.0 >= 2.14
 	gtk+-2.0 >= 2.10
 	gnome-vfs-2.0 >= 2.10
 	libgnomeui-2.0


Index: gnome-launch-box.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-launch-box/devel/gnome-launch-box.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- gnome-launch-box.spec	21 Oct 2007 11:43:05 -0000	1.8
+++ gnome-launch-box.spec	9 Jan 2008 10:41:26 -0000	1.9
@@ -1,13 +1,18 @@
 Summary: Funky application launcher
 Name: gnome-launch-box
 Version: 0.4
-Release: 5%{?dist}
+Release: 6%{?dist}
 License: GPL
 Group: Applications/Internet
 URL: http://developer.imendio.com/projects/gnome-launch-box
 Source0: http://ftp.imendio.com/pub/imendio/%{name}/src/%{name}-%{version}.tar.bz2
 Source1: gnome-launch-box.desktop
 
+# http://developer.imendio.com/issues/browse/GLB-39
+Patch0: glb-auto-transparent.patch
+# http://developer.imendio.com/issues/browse/GLB-37
+Patch1: glb-use-xdg-dirs.patch
+
 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 Requires(post): GConf2
 Requires(preun): GConf2
@@ -30,6 +35,9 @@
 %prep
 %setup -q
 
+%patch0 -p0 -b .auto-transparent
+%patch1 -p0 -b .xdg-user-dirs
+
 %build
 %configure --datadir=%{_datadir}/%{name}
 make %{?_smp_mflags}
@@ -69,6 +77,9 @@
 %{_datadir}/gnome-control-center/keybindings/90-gnome-launch-box.xml
 
 %changelog
+* Wed Jan 09 2008 - Bastien Nocera <bnocera at redhat.com> - 0.4-6
+- Add patches to use xdg-user-dirs and auto-detect transparency (#428079)
+
 * Sun Oct 21 2007 - Bastien Nocera <bnocera at redhat.com> - 0.4-5
 - Fix autolauncher missing a description (#344381)