summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorross <ross@b067294f-1dea-0310-9683-c47a78595994>2006-02-10 10:52:58 +0000
committerross <ross@b067294f-1dea-0310-9683-c47a78595994>2006-02-10 10:52:58 +0000
commit06eefd972c804a5f6715ec0490559fae010801e8 (patch)
tree64a566482fc019a0c3e07e10141c4d2ab58407cd
parent069c6dbaef61b8a07a606bb177b8fac316f51b67 (diff)
2006-02-10 Ross Burton <ross@openedhand.com>
* src/main.c: * src/callbacks.c: Use NULL rather than 0 to end execl() so that GCC doesn't complain. git-svn-id: http://svn.o-hand.com/repos/matchbox/trunk/Xoo@1308 b067294f-1dea-0310-9683-c47a78595994
-rw-r--r--ChangeLog9
-rw-r--r--src/callbacks.c2
-rw-r--r--src/main.c2
3 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a7ab0e6..3a1f585 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,11 @@
-2005-09-30 Ross Burton <ross@burtonini.com>
+2006-02-10 Ross Burton <ross@openedhand.com>
+
+ * src/main.c:
+ * src/callbacks.c:
+ Use NULL rather than 0 to end execl() so that GCC doesn't
+ complain.
+
+2005-09-30 Ross Burton <ross@openedhand.com>
* data/Xoo.glade:
* src/main.c:
diff --git a/src/callbacks.c b/src/callbacks.c
index 073cc68..e291ee9 100644
--- a/src/callbacks.c
+++ b/src/callbacks.c
@@ -129,7 +129,7 @@ on_select_device (GtkMenuItem * menuitem, FakeApp * app)
kill (xnest_pid, 9);
sleep (2);
- execl ("/bin/sh", "sh", "-c", "xoo", "--device", filename, 0);
+ execl ("/bin/sh", "sh", "-c", "xoo", "--device", filename, NULL);
g_warning ("Failed load device %s\n", filename);
diff --git a/src/main.c b/src/main.c
index f4a7e31..1dc8e7c 100644
--- a/src/main.c
+++ b/src/main.c
@@ -313,7 +313,7 @@ fakeapp_start_server (FakeApp * app)
{
case 0:
setenv ("DISPLAY", app->xnest_dpy_name, 1);
- execl ("/bin/sh", "sh", "-c", app->start_cmd, 0);
+ execl ("/bin/sh", "sh", "-c", app->start_cmd, NULL);
g_warning ("Failed to Launch %s\n", app->start_cmd);
exit (1);
case -1: