Application: Pass 0 (NULL) rather than to GApplication.

* gio/src/application.ccg: It is annoying that GApplication (and other
C code) distinguishes, of course.

2 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index c357ddd7..2461e871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2012-05-28  Murray Cumming  <murrayc@murrayc.com>
+
+	Application: Pass 0 (NULL) rather than "" to GApplication.
+
+	* gio/src/application.ccg: It is annoying that GApplication (and other 
+	C code) distinguishes, of course.
+
 2012-05-27  Murray Cumming  <murrayc@murrayc.com>
 
 	Gio::Application: Allow the application ID to be empty.
diff --git a/gio/src/application.ccg b/gio/src/application.ccg
index 2942d75a..8913b5ff 100644
--- a/gio/src/application.ccg
+++ b/gio/src/application.ccg
@@ -116,7 +116,7 @@ Application::Application(const Glib::ustring& application_id, ApplicationFlags f
 :
   // Mark this class as non-derived to allow C++ vfuncs to be skipped.
   Glib::ObjectBase(0),
-  Glib::Object(Glib::ConstructParams(custom_class_init(), "application_id", application_id.c_str(), "flags", ((GApplicationFlags)(flags)), static_cast<char*>(0)))
+  Glib::Object(Glib::ConstructParams(custom_class_init(), "application_id", (application_id.empty() ? 0 : application_id.c_str()), "flags", ((GApplicationFlags)(flags)), static_cast<char*>(0)))
 {
   
 }