mirror of
https://gitlab.gnome.org/GNOME/nautilus
synced 2024-11-05 16:04:31 +00:00
Treat "" CORBA strings as NULL.
2008-05-19 Christian Neumair <cneumair@gnome.org> * src/nautilus-shell.c (corba_open_windows), (corba_open_default_window): Treat "" CORBA strings as NULL. svn path=/trunk/; revision=14171
This commit is contained in:
parent
715a6e8159
commit
12b5342a88
2 changed files with 10 additions and 4 deletions
|
@ -1,3 +1,9 @@
|
||||||
|
2008-05-19 Christian Neumair <cneumair@gnome.org>
|
||||||
|
|
||||||
|
* src/nautilus-shell.c (corba_open_windows),
|
||||||
|
(corba_open_default_window):
|
||||||
|
Treat "" CORBA strings as NULL.
|
||||||
|
|
||||||
2008-05-19 Christian Neumair <cneumair@gnome.org>
|
2008-05-19 Christian Neumair <cneumair@gnome.org>
|
||||||
|
|
||||||
* src/nautilus-shell.c (open_window):
|
* src/nautilus-shell.c (open_window):
|
||||||
|
|
|
@ -224,8 +224,8 @@ corba_open_windows (PortableServer_Servant servant,
|
||||||
data = g_new0 (OpenWindowData, 1);
|
data = g_new0 (OpenWindowData, 1);
|
||||||
|
|
||||||
data->shell = NAUTILUS_SHELL (bonobo_object_from_servant (servant));
|
data->shell = NAUTILUS_SHELL (bonobo_object_from_servant (servant));
|
||||||
data->startup_id = g_strdup (startup_id);
|
data->startup_id = strcmp (startup_id, "") ? g_strdup (startup_id) : NULL;
|
||||||
data->geometry = g_strdup (geometry);
|
data->geometry = strcmp (geometry, "") ? g_strdup (geometry) : NULL;
|
||||||
data->browser_window = browser_window;
|
data->browser_window = browser_window;
|
||||||
|
|
||||||
for (i = 0; i < list->_length; i++) {
|
for (i = 0; i < list->_length; i++) {
|
||||||
|
@ -251,8 +251,8 @@ corba_open_default_window (PortableServer_Servant servant,
|
||||||
data = g_new0 (OpenWindowData, 1);
|
data = g_new0 (OpenWindowData, 1);
|
||||||
|
|
||||||
data->shell = NAUTILUS_SHELL (bonobo_object_from_servant (servant));
|
data->shell = NAUTILUS_SHELL (bonobo_object_from_servant (servant));
|
||||||
data->startup_id = g_strdup (startup_id);
|
data->startup_id = strcmp (startup_id, "") ? g_strdup (startup_id) : NULL;
|
||||||
data->geometry = g_strdup (geometry);
|
data->geometry = strcmp (geometry, "") ? g_strdup (geometry) : NULL;
|
||||||
data->browser_window = browser_window;
|
data->browser_window = browser_window;
|
||||||
|
|
||||||
g_idle_add (open_windows_at_idle, data);
|
g_idle_add (open_windows_at_idle, data);
|
||||||
|
|
Loading…
Reference in a new issue