nautilus r14171 - in trunk: . src

[cneumair svn gnome org]

Author: cneumair
Date: Mon May 19 12:26:27 2008
New Revision: 14171
URL: http://svn.gnome.org/viewvc/nautilus?rev=14171&view=rev

Log:
2008-05-19  Christian Neumair  <cneumair gnome org>

	* src/nautilus-shell.c (corba_open_windows),
	(corba_open_default_window):
	Treat "" CORBA strings as NULL.


Modified:
   trunk/ChangeLog
   trunk/src/nautilus-shell.c

Modified: trunk/src/nautilus-shell.c
==============================================================================
--- trunk/src/nautilus-shell.c	(original)
+++ trunk/src/nautilus-shell.c	Mon May 19 12:26:27 2008
@@ -224,8 +224,8 @@
 	data = g_new0 (OpenWindowData, 1);
 	
 	data->shell = NAUTILUS_SHELL (bonobo_object_from_servant (servant));
-	data->startup_id = g_strdup (startup_id);
-	data->geometry = g_strdup (geometry);
+	data->startup_id = strcmp (startup_id, "") ? g_strdup (startup_id) : NULL;
+	data->geometry = strcmp (geometry, "") ? g_strdup (geometry) : NULL;
 	data->browser_window = browser_window;
 
 	for (i = 0; i < list->_length; i++) {
@@ -251,8 +251,8 @@
 	data = g_new0 (OpenWindowData, 1);
 	
 	data->shell = NAUTILUS_SHELL (bonobo_object_from_servant (servant));
-	data->startup_id = g_strdup (startup_id);
-	data->geometry = g_strdup (geometry);
+	data->startup_id = strcmp (startup_id, "") ? g_strdup (startup_id) : NULL;
+	data->geometry = strcmp (geometry, "") ? g_strdup (geometry) : NULL;
 	data->browser_window = browser_window;
 
 	g_idle_add (open_windows_at_idle, data);