* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General
- * Public License along with this library; if not, write to the
- * Free Software Foundation, Inc., 59 Temple Place, Suite 330,
- * Boston, MA 02111-1307, USA.
+ * Public License along with this library; if not, see <http://www.gnu.org/licenses/>.
*
* Authors: Ryan Lortie <desrt@desrt.ca>
*/
/* DBus Interface definition {{{1 */
/* For documentation of these interfaces, see
- * https://live.gnome.org/GApplication/DBusAPI
+ * https://wiki.gnome.org/Projects/GLib/GApplication/DBusAPI
*/
static const gchar org_gtk_Application_xml[] =
"<node>"
else if (strcmp (method_name, "Open") == 0)
{
+ GApplicationFlags flags;
GVariant *platform_data;
const gchar *hint;
GVariant *array;
GFile **files;
gint n, i;
+ flags = g_application_get_flags (impl->app);
+ if ((flags & G_APPLICATION_HANDLES_OPEN) == 0)
+ {
+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED, "Application does not open files");
+ return;
+ }
+
/* freedesktop interface has no hint parameter */
if (g_str_equal (interface_name, "org.freedesktop.Application"))
{
else if (strcmp (method_name, "CommandLine") == 0)
{
+ GApplicationFlags flags;
GApplicationCommandLine *cmdline;
GVariant *platform_data;
int status;
+ flags = g_application_get_flags (impl->app);
+ if ((flags & G_APPLICATION_HANDLES_COMMAND_LINE) == 0)
+ {
+ g_dbus_method_invocation_return_error (invocation, G_DBUS_ERROR, G_DBUS_ERROR_NOT_SUPPORTED,
+ "Application does not handle command line arguments");
+ return;
+ }
+
/* Only on the GtkApplication interface */
cmdline = g_dbus_command_line_new (invocation);
}
int
-g_application_impl_command_line (GApplicationImpl *impl,
- gchar **arguments,
- GVariant *platform_data)
+g_application_impl_command_line (GApplicationImpl *impl,
+ const gchar * const *arguments,
+ GVariant *platform_data)
{
const static GDBusInterfaceVTable vtable = {
g_application_impl_cmdline_method_call
g_variant_new ("(o^aay@a{sv})", object_path, arguments, platform_data),
G_VARIANT_TYPE ("(i)"), 0, G_MAXINT, fd_list, NULL,
g_application_impl_cmdline_done, &data);
+ g_object_unref (fd_list);
}
#else
g_dbus_connection_call (impl->session_bus, impl->bus_name, impl->object_path,
if (fd_list && g_unix_fd_list_get_length (fd_list))
{
- gint *fds, n_fds, i;
+ const gint *fds;
- fds = g_unix_fd_list_steal_fds (fd_list, &n_fds);
- result = g_unix_input_stream_new (fds[0], TRUE);
- for (i = 1; i < n_fds; i++)
- (void) g_close (fds[i], NULL);
- g_free (fds);
+ fds = g_unix_fd_list_peek_fds (fd_list, NULL);
+ result = g_unix_input_stream_new (fds[0], FALSE);
+ g_object_weak_ref (G_OBJECT (result),
+ (GWeakNotify) g_object_unref,
+ g_object_ref (fd_list));
}
return result;