glib2 1.0.3-x86-mingw32 → 1.1.0-x86-mingw32

data/vendor/local/manifest/{glib_2.28.1-1_win32.mft → glib_2.28.8-1_win32.mft}

@@ -1,7 +1,7 @@
 bin/gspawn-win32-helper.exe
 bin/gspawn-win32-helper-console.exe
-bin/libglib-2.0-0.dll
 bin/libgio-2.0-0.dll
+bin/libglib-2.0-0.dll
 bin/libgmodule-2.0-0.dll
 bin/libgobject-2.0-0.dll
 bin/libgthread-2.0-0.dll
@@ -99,5 +99,5 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
-share/doc/glib-2.28.1/COPYING
-manifest/glib_2.28.1-1_win32.mft
+share/doc/glib-2.28.8/COPYING
+manifest/glib_2.28.8-1_win32.mft

data/vendor/local/share/aclocal/gsettings.m4

@@ -0,0 +1,83 @@
+dnl GLIB_GSETTINGS
+dnl Defines GSETTINGS_SCHEMAS_INSTALL which controls whether
+dnl the schema should be compiled
+dnl
+
+AC_DEFUN([GLIB_GSETTINGS],
+[
+  m4_pattern_allow([AM_V_GEN])
+  AC_ARG_ENABLE(schemas-compile,
+                AC_HELP_STRING([--disable-schemas-compile],
+                               [Disable regeneration of gschemas.compiled on install]),
+                [case ${enableval} in
+                  yes) GSETTINGS_DISABLE_SCHEMAS_COMPILE=""  ;;
+                  no)  GSETTINGS_DISABLE_SCHEMAS_COMPILE="1" ;;
+                  *) AC_MSG_ERROR([bad value ${enableval} for --enable-schemas-compile]) ;;
+                 esac])
+  AC_SUBST([GSETTINGS_DISABLE_SCHEMAS_COMPILE])
+  PKG_PROG_PKG_CONFIG([0.16])
+  AC_SUBST(gsettingsschemadir, [${datadir}/glib-2.0/schemas])
+  if test x$cross_compiling != xyes; then
+    GLIB_COMPILE_SCHEMAS=`$PKG_CONFIG --variable glib_compile_schemas gio-2.0`
+  else
+    AC_PATH_PROG(GLIB_COMPILE_SCHEMAS, glib-compile-schemas)
+  fi
+  AC_SUBST(GLIB_COMPILE_SCHEMAS)
+  if test "x$GLIB_COMPILE_SCHEMAS" = "x"; then
+    ifelse([$2],,[AC_MSG_ERROR([glib-compile-schemas not found.])],[$2])
+  else
+    ifelse([$1],,[:],[$1])
+  fi
+
+  GSETTINGS_RULES='
+.PHONY : uninstall-gsettings-schemas install-gsettings-schemas clean-gsettings-schemas
+
+mostlyclean-am: clean-gsettings-schemas
+
+gsettings__enum_file = $(addsuffix .enums.xml,$(gsettings_ENUM_NAMESPACE))
+
+%.gschema.valid: %.gschema.xml $(gsettings__enum_file)
+	$(AM_V_GEN) if test -f "$<"; then d=; else d="$(srcdir)/"; fi; $(GLIB_COMPILE_SCHEMAS) --strict --dry-run $(addprefix --schema-file=,$(gsettings__enum_file)) --schema-file=$${d}$< && touch [$]@
+
+all-am: $(gsettings_SCHEMAS:.xml=.valid)
+uninstall-am: uninstall-gsettings-schemas
+install-data-am: install-gsettings-schemas
+
+.SECONDARY: $(gsettings_SCHEMAS)
+
+install-gsettings-schemas: $(gsettings_SCHEMAS) $(gsettings__enum_file)
+	@$(NORMAL_INSTALL)
+	if test -n "$^"; then \
+		test -z "$(gsettingsschemadir)" || $(MKDIR_P) "$(DESTDIR)$(gsettingsschemadir)"; \
+		$(INSTALL_DATA) $^ "$(DESTDIR)$(gsettingsschemadir)"; \
+		test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir); \
+	fi
+
+uninstall-gsettings-schemas:
+	@$(NORMAL_UNINSTALL)
+	@list='\''$(gsettings_SCHEMAS) $(gsettings__enum_file)'\''; test -n "$(gsettingsschemadir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e '\''s|^.*/||'\''`; \
+	test -n "$$files" || exit 0; \
+	echo " ( cd '\''$(DESTDIR)$(gsettingsschemadir)'\'' && rm -f" $$files ")"; \
+	cd "$(DESTDIR)$(gsettingsschemadir)" && rm -f $$files
+	test -n "$(GSETTINGS_DISABLE_SCHEMAS_COMPILE)$(DESTDIR)" || $(GLIB_COMPILE_SCHEMAS) $(gsettingsschemadir)
+
+clean-gsettings-schemas:
+	rm -f $(gsettings_SCHEMAS:.xml=.valid) $(gsettings__enum_file)
+
+ifdef gsettings_ENUM_NAMESPACE
+$(gsettings__enum_file): $(gsettings_ENUM_FILES)
+	$(AM_V_GEN) glib-mkenums --comments '\''<!-- @comment@ -->'\'' --fhead "<schemalist>" --vhead "  <@type@ id='\''$(gsettings_ENUM_NAMESPACE).@EnumName@'\''>" --vprod "    <value nick='\''@valuenick@'\'' value='\''@valuenum@'\''/>" --vtail "  </@type@>" --ftail "</schemalist>" [$]^ > [$]@.tmp && mv [$]@.tmp [$]@
+endif
+'
+  _GSETTINGS_SUBST(GSETTINGS_RULES)
+])
+
+dnl _GSETTINGS_SUBST(VARIABLE)
+dnl Abstract macro to do either _AM_SUBST_NOTMAKE or AC_SUBST
+AC_DEFUN([_GSETTINGS_SUBST],
+[
+AC_SUBST([$1])
+m4_ifdef([_AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE([$1])])
+]
+)

data/vendor/local/share/gtk-doc/html/gio/GAction.html

@@ -8,7 +8,7 @@
 <link rel="up" href="application.html" title="Application support">
 <link rel="prev" href="GSimpleActionGroup.html" title="GSimpleActionGroup">
 <link rel="next" href="GSimpleAction.html" title="GSimpleAction">
-<meta name="generator" content="GTK-Doc V1.16.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -115,7 +115,7 @@ range.
 <p>
 <a class="link" href="GAction.html" title="GAction"><span class="type">GAction</span></a> is merely the interface to the concept of an action, as
 described above.  Various implementations of actions exist, including
-<a class="link" href="GSimpleAction.html" title="GSimpleAction"><span class="type">GSimpleAction</span></a> and <a href="http://library.gnome.org/devel/gtk/2.24/GtkAction.html"><span class="type">GtkAction</span></a>.
+<a class="link" href="GSimpleAction.html" title="GSimpleAction"><span class="type">GSimpleAction</span></a> and <a href="http://library.gnome.org/devel/gtk/GtkAction.html"><span class="type">GtkAction</span></a>.
 </p>
 <p>
 In all cases, the implementing class is responsible for storing the
@@ -464,6 +464,6 @@ action is stateless.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.16.1</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/gio/GActionGroup.html

@@ -8,7 +8,7 @@
 <link rel="up" href="application.html" title="Application support">
 <link rel="prev" href="application.html" title="Application support">
 <link rel="next" href="GSimpleActionGroup.html" title="GSimpleActionGroup">
-<meta name="generator" content="GTK-Doc V1.16.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -749,6 +749,6 @@ Signals that the state of the named action has changed.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.16.1</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/gio/GAppInfo.html

@@ -8,7 +8,7 @@
 <link rel="up" href="types.html" title="File types and applications">
 <link rel="prev" href="gio-GContentType.html" title="GContentType">
 <link rel="next" href="gio-Desktop-file-based-GAppInfo.html" title="GDesktopAppInfo">
-<meta name="generator" content="GTK-Doc V1.16.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -1431,7 +1431,7 @@ the application startup notification started in <a class="link" href="GAppInfo.h
 <pre class="programlisting"><a class="link" href="GAppInfo.html#GAppLaunchContext"><span class="returnvalue">GAppLaunchContext</span></a> * g_app_launch_context_new            (<em class="parameter"><code><span class="type">void</span></code></em>);</pre>
 <p>
 Creates a new application launch context. This is not normally used,
-instead you instantiate a subclass of this, such as <a href="http://library.gnome.org/devel/gdk/2.24/gdk3-Application-launching.html#GdkAppLaunchContext"><span class="type">GdkAppLaunchContext</span></a>.
+instead you instantiate a subclass of this, such as <a href="http://library.gnome.org/devel/gdk3/gdk-Application-launching.html#GdkAppLaunchContext"><span class="type">GdkAppLaunchContext</span></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1445,6 +1445,6 @@ instead you instantiate a subclass of this, such as <a href="http://library.gnom
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.16.1</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>

data/vendor/local/share/gtk-doc/html/gio/GApplication.html

@@ -8,7 +8,7 @@
 <link rel="up" href="application.html" title="Application support">
 <link rel="prev" href="GSimpleAction.html" title="GSimpleAction">
 <link rel="next" href="GApplicationCommandLine.html" title="GApplicationCommandLine">
-<meta name="generator" content="GTK-Doc V1.16.1 (XML mode)">
+<meta name="generator" content="GTK-Doc V1.17 (XML mode)">
 <link rel="stylesheet" href="style.css" type="text/css">
 </head>
 <body bgcolor="white" text="black" link="#0000FF" vlink="#840084" alink="#0000FF">
@@ -135,7 +135,7 @@ A <a class="link" href="GApplication.html" title="GApplication"><span class="typ
 given application identifier.  The GApplication class wraps some
 low-level platform-specific services and is intended to act as the
 foundation for higher-level application classes such as
-<a href="http://library.gnome.org/devel/gtk/2.24/GtkApplication.html"><span class="type">GtkApplication</span></a> or <span class="type">MxApplication</span>.  In general, you should not use
+<a href="http://library.gnome.org/devel/gtk/GtkApplication.html"><span class="type">GtkApplication</span></a> or <span class="type">MxApplication</span>.  In general, you should not use
 this class outside of a higher level framework.
 </p>
 <p>
@@ -191,6 +191,7 @@ There is a number of different entry points into a <a class="link" href="GApplic
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
 <li class="listitem">via 'Activate' (i.e. just starting the application)</li>
 <li class="listitem">via 'Open' (i.e. opening some files)</li>
+<li class="listitem">by handling a command-line</li>
 <li class="listitem">via activating an action</li>
 </ul></div>
 <p>
@@ -198,6 +199,35 @@ The <a class="link" href="GApplication.html#GApplication-startup" title='The "st
 initialization for all of these in a single place.
 </p>
 <p>
+Regardless of which of these entry points is used to start the application,
+GApplication passes some <em class="firstterm"><a name="platform-data"></a>platform
+data</em> from the launching instance to the primary instance,
+in the form of a <a href="http://library.gnome.org/devel/glib/unstable/glib-GVariant.html#GVariant"><span class="type">GVariant</span></a> dictionary mapping strings to variants.
+To use platform data, override the <em class="parameter"><code>before_emit</code></em> or <em class="parameter"><code>after_emit</code></em> virtual
+functions in your <a class="link" href="GApplication.html" title="GApplication"><span class="type">GApplication</span></a> subclass. When dealing with
+<span class="type">GApplicationCommandline</span> objects, the platform data is directly
+available via <a class="link" href="GApplicationCommandLine.html#g-application-command-line-get-cwd" title="g_application_command_line_get_cwd ()"><code class="function">g_application_command_line_get_cwd()</code></a>,
+<a class="link" href="GApplicationCommandLine.html#g-application-command-line-get-environ" title="g_application_command_line_get_environ ()"><code class="function">g_application_command_line_get_environ()</code></a> and
+<a class="link" href="GApplicationCommandLine.html#g-application-command-line-get-platform-data" title="g_application_command_line_get_platform_data ()"><code class="function">g_application_command_line_get_platform_data()</code></a>.
+</p>
+<p>
+As the name indicates, the platform data may vary depending on the
+operating system, but it always includes the current directory (key
+"cwd"), and optionally the environment (ie the set of environment
+variables and their values) of the calling process (key "environ").
+The environment is only added to the platform data if the
+<span class="type">G_APPLICATION_SEND_ENVIONMENT</span> flag is set. GApplication subclasses
+can add their own platform data by overriding the <em class="parameter"><code>add_platform_data</code></em>
+virtual function. For instance, <a href="http://library.gnome.org/devel/gtk/GtkApplication.html"><span class="type">GtkApplication</span></a> adds startup notification
+data in this way.
+</p>
+<p>
+To parse commandline arguments you may handle the
+<a class="link" href="GApplication.html#GApplication-command-line" title='The "command-line" signal'><span class="type">"command-line"</span></a> signal or override the <code class="function">local_command_line()</code>
+vfunc, to parse them in either the primary instance or the local instance,
+respectively.
+</p>
+<p>
 </p>
 <div class="example">
 <a name="gapplication-example-open"></a><p class="title"><b>Example 13. Opening files with a GApplication</b></p>
@@ -592,25 +622,31 @@ See <a class="link" href="GApplication.html#g-application-run" title="g_applicat
 </tr>
 <tr>
 <td><p><span class="term"><em class="structfield"><code><a name="GApplicationClass.before-emit"></a>before_emit</code></em> ()</span></p></td>
-<td>invoked on the primary instance before 'activate', 'open' or any action invocation</td>
+<td>invoked on the primary instance before 'activate', 'open',
+'command-line' or any action invocation, gets the 'platform data' from
+the calling instance</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="structfield"><code><a name="GApplicationClass.after-emit"></a>after_emit</code></em> ()</span></p></td>
-<td>invoked on the primary instance after 'activate', 'open' or any action invocation</td>
+<td>invoked on the primary instance after 'activate', 'open',
+'command-line' or any action invocation, gets the 'platform data' from
+the calling instance</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="structfield"><code><a name="GApplicationClass.add-platform-data"></a>add_platform_data</code></em> ()</span></p></td>
-<td>invoked (locally) to add 'platform data' to be sent to the primary instance when
-activating, opening or invoking actions</td>
+<td>invoked (locally) to add 'platform data' to be sent to
+the primary instance when activating, opening or invoking actions</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="structfield"><code><a name="GApplicationClass.quit-mainloop"></a>quit_mainloop</code></em> ()</span></p></td>
-<td>invoked on the primary instance when the use count of the application drops to zero (and
-after any inactivity timeout, if requested)</td>
+<td>invoked on the primary instance when the use count of the
+application drops to zero (and after any inactivity timeout, if
+requested)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="structfield"><code><a name="GApplicationClass.run-mainloop"></a>run_mainloop</code></em> ()</span></p></td>
-<td>invoked on the primary instance from <a class="link" href="GApplication.html#g-application-run" title="g_application_run ()"><code class="function">g_application_run()</code></a> if the use-count is non-zero</td>
+<td>invoked on the primary instance from <a class="link" href="GApplication.html#g-application-run" title="g_application_run ()"><code class="function">g_application_run()</code></a>
+if the use-count is non-zero</td>
 </tr>
 </tbody>
 </table></div>
@@ -655,20 +691,31 @@ Flags used to define the behaviour of a <a class="link" href="GApplication.html"
 </tr>
 <tr>
 <td><p><a name="G-APPLICATION-HANDLES-OPEN:CAPS"></a><span class="term"><code class="literal">G_APPLICATION_HANDLES_OPEN</code></span></p></td>
-<td>This application handles opening files (in the
-    primary instance)
+<td>This application handles opening files (in
+    the primary instance). Note that this flag only affects the default
+    implementation of <code class="function">local_command_line()</code>, and has no effect if
+    <a class="link" href="GApplication.html#G-APPLICATION-HANDLES-COMMAND-LINE:CAPS"><code class="literal">G_APPLICATION_HANDLES_COMMAND_LINE</code></a> is given.
+    See <a class="link" href="GApplication.html#g-application-run" title="g_application_run ()"><code class="function">g_application_run()</code></a> for details.
 </td>
 </tr>
 <tr>
 <td><p><a name="G-APPLICATION-HANDLES-COMMAND-LINE:CAPS"></a><span class="term"><code class="literal">G_APPLICATION_HANDLES_COMMAND_LINE</code></span></p></td>
 <td>This application handles command line
-    arguments (in the primary instance)
+    arguments (in the primary instance). Note that this flag only affect
+    the default implementation of <code class="function">local_command_line()</code>.
+    See <a class="link" href="GApplication.html#g-application-run" title="g_application_run ()"><code class="function">g_application_run()</code></a> for details.
 </td>
 </tr>
 <tr>
 <td><p><a name="G-APPLICATION-SEND-ENVIRONMENT:CAPS"></a><span class="term"><code class="literal">G_APPLICATION_SEND_ENVIRONMENT</code></span></p></td>
 <td>Send the environment of the
-    launching process to the primary instance
+    launching process to the primary instance. Set this flag if your
+    application is expected to behave differently depending on certain
+    environment variables. For instance, an editor might be expected
+    to use the <code class="envar">GIT_COMMITTER_NAME</code> environment variable
+    when editing a git commit message. The environment is available
+    to the <a class="link" href="GApplication.html#GApplication-command-line" title='The "command-line" signal'><span class="type">"command-line"</span></a> signal handler, via
+    <a class="link" href="GApplicationCommandLine.html#g-application-command-line-getenv" title="g_application_command_line_getenv ()"><code class="function">g_application_command_line_getenv()</code></a>.
 </td>
 </tr>
 </tbody>
@@ -691,9 +738,9 @@ For convenience, the restrictions on application identifiers are
 reproduced here:
 </p>
 <div class="itemizedlist"><ul class="itemizedlist" type="disc">
-<li class="listitem">Application identifiers must contain only the ASCII characters "[A-Z][a-z][0-9]_-" and must not begin with a digit.</li>
-<li class="listitem">Application identifiers must contain at least one '.' (period) character (and thus at least two elements).</li>
-<li class="listitem">Application identifiers must not begin with a '.' (period) character.</li>
+<li class="listitem">Application identifiers must contain only the ASCII characters "[A-Z][a-z][0-9]_-." and must not begin with a digit.</li>
+<li class="listitem">Application identifiers must contain at least one '.' (period) character (and thus at least three elements).</li>
+<li class="listitem">Application identifiers must not begin or end with a '.' (period) character.</li>
 <li class="listitem">Application identifiers must not contain consecutive '.' (period) characters.</li>
 <li class="listitem">Application identifiers must not exceed 255 characters.</li>
 </ul></div>
@@ -1032,7 +1079,7 @@ Attempts registration of the application.
 This is the point at which the application discovers if it is the
 primary instance or merely acting as a remote for an already-existing
 primary instance.  This is implemented by attempting to acquire the
-application identifier as a uniue bus name on the session bus using
+application identifier as a unique bus name on the session bus using
 GDBus.
 </p>
 <p>
@@ -1221,14 +1268,37 @@ Runs the application.
 </p>
 <p>
 This function is intended to be run from <code class="function">main()</code> and its return value
-is intended to be returned by <code class="function">main()</code>.
+is intended to be returned by <code class="function">main()</code>. Although you are expected to pass
+the <em class="parameter"><code>argc</code></em>, <em class="parameter"><code>argv</code></em> parameters from <code class="function">main()</code> to this function, it is possible
+to pass <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a> if <em class="parameter"><code>argv</code></em> is not available or commandline handling is not
+required.
+</p>
+<p>
+First, the <code class="function">local_command_line()</code> virtual function is invoked.
+This function always runs on the local instance. It gets passed a pointer
+to a <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>-terminated copy of <em class="parameter"><code>argv</code></em> and is expected to remove the arguments
+that it handled (shifting up remaining arguments). See
+<a class="xref" href="GApplicationCommandLine.html#gapplication-example-cmdline2" title="Example 16. Split commandline handling">Example 16, “Split commandline handling”</a> for an example of
+parsing <em class="parameter"><code>argv</code></em> manually. Alternatively, you may use the <a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#GOptionContext"><span class="type">GOptionContext</span></a> API,
+after setting <code class="literal">argc = g_strv_length (argv);</code>.
+</p>
+<p>
+The last argument to <code class="function">local_command_line()</code> is a pointer to the <em class="parameter"><code>status</code></em>
+variable which can used to set the exit status that is returned from
+<a class="link" href="GApplication.html#g-application-run" title="g_application_run ()"><code class="function">g_application_run()</code></a>.
+</p>
+<p>
+If <code class="function">local_command_line()</code> returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a>, the command line is expected
+to be completely handled, including possibly registering as the primary
+instance, calling <a class="link" href="GApplication.html#g-application-activate" title="g_application_activate ()"><code class="function">g_application_activate()</code></a> or <a class="link" href="GApplication.html#g-application-open" title="g_application_open ()"><code class="function">g_application_open()</code></a>, etc.
 </p>
 <p>
-First, the <code class="function">local_command_line()</code> virtual function is invoked.  This
-function always runs on the local instance.  If that function returns
-<a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> then the application is registered and the <a class="link" href="GApplication.html#GApplication-command-line" title='The "command-line" signal'><span class="type">"command-line"</span></a>
-signal is emitted in the primary instance (which may or may not be
-this instance).
+If <code class="function">local_command_line()</code> returns <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#FALSE:CAPS"><code class="literal">FALSE</code></a> then the application is registered
+and the <a class="link" href="GApplication.html#GApplication-command-line" title='The "command-line" signal'><span class="type">"command-line"</span></a> signal is emitted in the primary
+instance (which may or may not be this instance). The signal handler
+gets passed a <span class="type">GApplicationCommandline</span> object that (among other things)
+contains the remaining commandline arguments that have not been handled
+by <code class="function">local_command_line()</code>.
 </p>
 <p>
 If the application has the <a class="link" href="GApplication.html#G-APPLICATION-HANDLES-COMMAND-LINE:CAPS"><code class="literal">G_APPLICATION_HANDLES_COMMAND_LINE</code></a>
@@ -1247,10 +1317,19 @@ given and the <a class="link" href="GApplication.html#G-APPLICATION-HANDLES-OPEN
 are assumed to be filenames and <a class="link" href="GApplication.html#g-application-open" title="g_application_open ()"><code class="function">g_application_open()</code></a> is called.
 </p>
 <p>
+If you need to handle commandline arguments that are not filenames,
+and you don't mind commandline handling to happen in the primary
+instance, you should set <code class="literal">G_APPLICATION_HANDLED_COMMAND_LINE</code> and
+process the commandline arguments in your <a class="link" href="GApplication.html#GApplication-command-line" title='The "command-line" signal'><span class="type">"command-line"</span></a>
+signal handler, either manually or using the <a href="http://library.gnome.org/devel/glib/unstable/glib-Commandline-option-parser.html#GOptionContext"><span class="type">GOptionContext</span></a> API.
+</p>
+<p>
 If you are interested in doing more complicated local handling of the
 commandline then you should implement your own <a class="link" href="GApplication.html" title="GApplication"><span class="type">GApplication</span></a> subclass
-and override <code class="function">local_command_line()</code>. See
-<a class="xref" href="GApplicationCommandLine.html#gapplication-example-cmdline2" title="Example 16. Complicated commandline handling">Example 16, “Complicated commandline handling”</a> for an example.
+and override <code class="function">local_command_line()</code>. In this case, you most likely want
+to return <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#TRUE:CAPS"><code class="literal">TRUE</code></a> from your <code class="function">local_command_line()</code> implementation to
+suppress the default handling. See
+<a class="xref" href="GApplicationCommandLine.html#gapplication-example-cmdline2" title="Example 16. Split commandline handling">Example 16, “Split commandline handling”</a> for an example.
 </p>
 <p>
 If, after the above is done, the use count of the application is zero
@@ -1273,12 +1352,11 @@ around to provide its <span class="emphasis"><em>service</em></span> to others).
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>argc</code></em> :</span></p></td>
-<td>the argc from <code class="function">main()</code>
-</td>
+<td>the argc from <code class="function">main()</code> (or 0 if <em class="parameter"><code>argv</code></em> is <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>)</td>
 </tr>
 <tr>
 <td><p><span class="term"><em class="parameter"><code>argv</code></em> :</span></p></td>
-<td>the argv from <code class="function">main()</code>. <span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=argc]</span>
+<td>the argv from <code class="function">main()</code>, or <a href="http://library.gnome.org/devel/glib/unstable/glib-Standard-Macros.html#NULL:CAPS"><code class="literal">NULL</code></a>. <span class="annotation">[<acronym title="Parameter points to an array of items."><span class="acronym">array</span></acronym> length=argc]</span>
 </td>
 </tr>
 <tr>
@@ -1364,8 +1442,8 @@ activation occurs. See <a class="link" href="GApplication.html#g-application-act
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>                 user_data)         : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre>
 <p>
 The ::command-line signal is emitted on the primary instance when
-a commandline is not handled locally. See <a class="link" href="GApplication.html#g-application-run" title="g_application_run ()"><code class="function">g_application_run()</code></a> for
-more information.
+a commandline is not handled locally. See <a class="link" href="GApplication.html#g-application-run" title="g_application_run ()"><code class="function">g_application_run()</code></a> and
+the <span class="type">GApplicationCommandline</span> documentation for more information.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1383,6 +1461,11 @@ passed commandline</td>
 <td><p><span class="term"><em class="parameter"><code>user_data</code></em> :</span></p></td>
 <td>user data set when the signal handler was connected.</td>
 </tr>
+<tr>
+<td><p><span class="term"><span class="emphasis"><em>Returns</em></span> :</span></p></td>
+<td>An integer that is set as the exit status for the calling
+process. See <a class="link" href="GApplicationCommandLine.html#g-application-command-line-set-exit-status" title="g_application_command_line_set_exit_status ()"><code class="function">g_application_command_line_set_exit_status()</code></a>.</td>
+</tr>
 </tbody>
 </table></div>
 </div>
@@ -1433,7 +1516,7 @@ files to open. See <a class="link" href="GApplication.html#g-application-open" t
                                                         <a href="http://library.gnome.org/devel/glib/unstable/glib-Basic-Types.html#gpointer"><span class="type">gpointer</span></a>      user_data)        : <a href="http://library.gnome.org/devel/gobject/unstable/gobject-Signals.html#G-SIGNAL-RUN-LAST:CAPS"><code class="literal">Run Last</code></a></pre>
 <p>
 The ::startup signal is emitted on the primary instance immediately
-after registration. See <code class="function">g_activation_register()</code>.
+after registration. See <a class="link" href="GApplication.html#g-application-register" title="g_application_register ()"><code class="function">g_application_register()</code></a>.
 </p>
 <div class="variablelist"><table border="0">
 <col align="left" valign="top">
@@ -1453,6 +1536,6 @@ after registration. See <code class="function">g_activation_register()</code>.
 </div>
 <div class="footer">
 <hr>
-          Generated by GTK-Doc V1.16.1</div>
+          Generated by GTK-Doc V1.17</div>
 </body>
 </html>