/* GIO - GLib Input, Output and Streaming Library
- *
+ *
* Copyright (C) 2006-2007 Red Hat, Inc.
* Copyright © 2007 Ryan Lortie
*
#define ADDED_ASSOCIATIONS_GROUP "Added Associations"
#define REMOVED_ASSOCIATIONS_GROUP "Removed Associations"
#define MIME_CACHE_GROUP "MIME Cache"
+#define GENERIC_NAME_KEY "GenericName"
#define FULL_NAME_KEY "X-GNOME-FullName"
+#define KEYWORDS_KEY "X-GNOME-Keywords"
+
+enum {
+ PROP_0,
+ PROP_FILENAME
+};
static void g_desktop_app_info_iface_init (GAppInfoIface *iface);
static GList * get_all_desktop_entries_for_mime_type (const char *base_mime_type,
char *filename;
char *name;
- /* FIXME: what about GenericName ? */
+ char *generic_name;
char *fullname;
char *comment;
char *icon_name;
GIcon *icon;
+ char **keywords;
char **only_show_in;
char **not_show_in;
char *try_exec;
char *exec;
char *binary;
char *path;
+ char *categories;
guint nodisplay : 1;
guint hidden : 1;
G_IMPLEMENT_INTERFACE (G_TYPE_APP_INFO,
g_desktop_app_info_iface_init))
+G_LOCK_DEFINE_STATIC (g_desktop_env);
+static gchar *g_desktop_env = NULL;
+
static gpointer
search_path_init (gpointer data)
{
g_free (info->desktop_id);
g_free (info->filename);
g_free (info->name);
+ g_free (info->generic_name);
g_free (info->fullname);
g_free (info->comment);
g_free (info->icon_name);
if (info->icon)
g_object_unref (info->icon);
+ g_strfreev (info->keywords);
g_strfreev (info->only_show_in);
g_strfreev (info->not_show_in);
g_free (info->try_exec);
g_free (info->exec);
g_free (info->binary);
g_free (info->path);
+ g_free (info->categories);
G_OBJECT_CLASS (g_desktop_app_info_parent_class)->finalize (object);
}
static void
+g_desktop_app_info_set_property(GObject *object,
+ guint prop_id,
+ const GValue *value,
+ GParamSpec *pspec)
+{
+ GDesktopAppInfo *self = G_DESKTOP_APP_INFO (object);
+
+ switch (prop_id)
+ {
+ case PROP_FILENAME:
+ self->filename = g_value_dup_string (value);
+ break;
+
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
+g_desktop_app_info_get_property(GObject *object,
+ guint prop_id,
+ GValue *value,
+ GParamSpec *pspec)
+{
+ GDesktopAppInfo *self = G_DESKTOP_APP_INFO (object);
+
+ switch (prop_id)
+ {
+ case PROP_FILENAME:
+ g_value_set_string (value, self->filename);
+ break;
+ default:
+ G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+ break;
+ }
+}
+
+static void
g_desktop_app_info_class_init (GDesktopAppInfoClass *klass)
{
GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+ gobject_class->get_property = g_desktop_app_info_get_property;
+ gobject_class->set_property = g_desktop_app_info_set_property;
gobject_class->finalize = g_desktop_app_info_finalize;
+
+ /**
+ * GDesktopAppInfo:filename
+ *
+ * The origin filename of this #GDesktopAppInfo
+ */
+ g_object_class_install_property (gobject_class,
+ PROP_FILENAME,
+ g_param_spec_string ("filename", "Filename", "",
+ NULL,
+ G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
}
static void
}
-/**
- * g_desktop_app_info_new_from_keyfile:
- * @key_file: an opened #GKeyFile
- *
- * Creates a new #GDesktopAppInfo.
- *
- * Returns: a new #GDesktopAppInfo or %NULL on error.
- *
- * Since: 2.18
- **/
-GDesktopAppInfo *
-g_desktop_app_info_new_from_keyfile (GKeyFile *key_file)
+static gboolean
+g_desktop_app_info_load_from_keyfile (GDesktopAppInfo *info,
+ GKeyFile *key_file)
{
- GDesktopAppInfo *info;
char *start_group;
char *type;
char *try_exec;
-
+
start_group = g_key_file_get_start_group (key_file);
if (start_group == NULL || strcmp (start_group, G_KEY_FILE_DESKTOP_GROUP) != 0)
{
g_free (start_group);
- return NULL;
+ return FALSE;
}
g_free (start_group);
if (type == NULL || strcmp (type, G_KEY_FILE_DESKTOP_TYPE_APPLICATION) != 0)
{
g_free (type);
- return NULL;
+ return FALSE;
}
g_free (type);
if (t == NULL)
{
g_free (try_exec);
- return NULL;
+ return FALSE;
}
g_free (t);
}
- info = g_object_new (G_TYPE_DESKTOP_APP_INFO, NULL);
- info->filename = NULL;
-
info->name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NAME, NULL, NULL);
+ info->generic_name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, GENERIC_NAME_KEY, NULL, NULL);
info->fullname = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, FULL_NAME_KEY, NULL, NULL);
+ info->keywords = g_key_file_get_locale_string_list (key_file, G_KEY_FILE_DESKTOP_GROUP, KEYWORDS_KEY, NULL, NULL, NULL);
info->comment = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_COMMENT, NULL, NULL);
info->nodisplay = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, NULL) != FALSE;
info->icon_name = g_key_file_get_locale_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_ICON, NULL, NULL);
info->startup_notify = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_STARTUP_NOTIFY, NULL) != FALSE;
info->no_fuse = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, "X-GIO-NoFuse", NULL) != FALSE;
info->hidden = g_key_file_get_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_HIDDEN, NULL) != FALSE;
+ info->categories = g_key_file_get_string (key_file, G_KEY_FILE_DESKTOP_GROUP, G_KEY_FILE_DESKTOP_KEY_CATEGORIES, NULL);
info->icon = NULL;
if (info->icon_name)
info->path = NULL;
}
+ return TRUE;
+}
+
+static gboolean
+g_desktop_app_info_load_file (GDesktopAppInfo *self)
+{
+ GKeyFile *key_file;
+ gboolean retval = FALSE;
+
+ g_return_val_if_fail (self->filename != NULL, FALSE);
+
+ key_file = g_key_file_new ();
+
+ if (g_key_file_load_from_file (key_file,
+ self->filename,
+ G_KEY_FILE_NONE,
+ NULL))
+ {
+ retval = g_desktop_app_info_load_from_keyfile (self, key_file);
+ }
+
+ g_key_file_free (key_file);
+ return retval;
+}
+
+/**
+ * g_desktop_app_info_new_from_keyfile:
+ * @key_file: an opened #GKeyFile
+ *
+ * Creates a new #GDesktopAppInfo.
+ *
+ * Returns: a new #GDesktopAppInfo or %NULL on error.
+ *
+ * Since: 2.18
+ **/
+GDesktopAppInfo *
+g_desktop_app_info_new_from_keyfile (GKeyFile *key_file)
+{
+ GDesktopAppInfo *info;
+
+ info = g_object_new (G_TYPE_DESKTOP_APP_INFO, NULL);
+ info->filename = NULL;
+ if (!g_desktop_app_info_load_from_keyfile (info, key_file))
+ {
+ g_object_unref (info);
+ return NULL;
+ }
return info;
}
GDesktopAppInfo *
g_desktop_app_info_new_from_filename (const char *filename)
{
- GKeyFile *key_file;
GDesktopAppInfo *info = NULL;
- key_file = g_key_file_new ();
-
- if (g_key_file_load_from_file (key_file,
- filename,
- G_KEY_FILE_NONE,
- NULL))
+ info = g_object_new (G_TYPE_DESKTOP_APP_INFO, "filename", filename, NULL);
+ if (!g_desktop_app_info_load_file (info))
{
- info = g_desktop_app_info_new_from_keyfile (key_file);
- if (info)
- info->filename = g_strdup (filename);
- }
-
- g_key_file_free (key_file);
-
+ g_object_unref (info);
+ return NULL;
+ }
return info;
}
new_info->desktop_id = g_strdup (info->desktop_id);
new_info->name = g_strdup (info->name);
+ new_info->generic_name = g_strdup (info->generic_name);
new_info->fullname = g_strdup (info->fullname);
+ new_info->keywords = g_strdupv (info->keywords);
new_info->comment = g_strdup (info->comment);
new_info->nodisplay = info->nodisplay;
new_info->icon_name = g_strdup (info->icon_name);
return info->icon;
}
+/**
+ * g_desktop_app_info_get_categories:
+ * @info: a #GDesktopAppInfo
+ *
+ * Gets the categories from the desktop file.
+ *
+ * Returns: The unparsed Categories key from the desktop file;
+ * i.e. no attempt is made to split it by ';' or validate it.
+ */
+const char *
+g_desktop_app_info_get_categories (GDesktopAppInfo *info)
+{
+ return info->categories;
+}
+
+/**
+ * g_desktop_app_info_get_keywords:
+ * @info: a #GDesktopAppInfo
+ *
+ * Gets the keywords from the desktop file.
+ *
+ * Returns: The value of the X-GNOME-Keywords key
+ *
+ * Since: 2.32
+ */
+const char * const *
+g_desktop_app_info_get_keywords (GDesktopAppInfo *info)
+{
+ return (const char * const *)info->keywords;
+}
+
+/**
+ * g_desktop_app_info_get_generic_name:
+ * @info: a #GDesktopAppInfo
+ *
+ * Gets the generic name from the destkop file.
+ *
+ * Returns: The value of the GenericName key
+ */
+const char *
+g_desktop_app_info_get_generic_name (GDesktopAppInfo *info)
+{
+ return info->generic_name;
+}
+
+/**
+ * g_desktop_app_info_get_nodisplay:
+ * @info: a #GDesktopAppInfo
+ *
+ * Gets the value of the NoDisplay key, which helps determine if the
+ * application info should be shown in menus. See
+ * #G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY and g_app_info_should_show().
+ *
+ * Returns: The value of the NoDisplay key
+ *
+ * Since: 2.30
+ */
+gboolean
+g_desktop_app_info_get_nodisplay (GDesktopAppInfo *info)
+{
+ return info->nodisplay;
+}
+
+/**
+ * g_desktop_app_info_get_show_in:
+ * @info: a #GDesktopAppInfo
+ * @desktop_env: a string specifying a desktop name
+ *
+ * Checks if the application info should be shown in menus that list available
+ * applications for a specific name of the desktop, based on the
+ * <literal>OnlyShowIn</literal> and <literal>NotShowIn</literal> keys.
+ *
+ * If @desktop_env is %NULL, then the name of the desktop set with
+ * g_desktop_app_info_set_desktop_env() is used.
+ *
+ * Note that g_app_info_should_show() for @info will include this check (with
+ * %NULL for @desktop_env) as well as additional checks.
+ *
+ * Returns: %TRUE if the @info should be shown in @desktop_env according to the
+ * <literal>OnlyShowIn</literal> and <literal>NotShowIn</literal> keys, %FALSE
+ * otherwise.
+ *
+ * Since: 2.30
+ */
+gboolean
+g_desktop_app_info_get_show_in (GDesktopAppInfo *info,
+ const gchar *desktop_env)
+{
+ gboolean found;
+ int i;
+
+ g_return_val_if_fail (G_IS_DESKTOP_APP_INFO (info), FALSE);
+
+ if (!desktop_env) {
+ G_LOCK (g_desktop_env);
+ desktop_env = g_desktop_env;
+ G_UNLOCK (g_desktop_env);
+ }
+
+ if (info->only_show_in)
+ {
+ if (desktop_env == NULL)
+ return FALSE;
+
+ found = FALSE;
+ for (i = 0; info->only_show_in[i] != NULL; i++)
+ {
+ if (strcmp (info->only_show_in[i], desktop_env) == 0)
+ {
+ found = TRUE;
+ break;
+ }
+ }
+ if (!found)
+ return FALSE;
+ }
+
+ if (info->not_show_in && desktop_env)
+ {
+ for (i = 0; info->not_show_in[i] != NULL; i++)
+ {
+ if (strcmp (info->not_show_in[i], desktop_env) == 0)
+ return FALSE;
+ }
+ }
+
+ return TRUE;
+}
+
static char *
expand_macro_single (char macro, char *uri)
{
}
static GList *
-uri_list_segment_to_files (GList *start,
- GList *end)
+create_files_for_uris (GList *uris)
{
GList *res;
- GFile *file;
+ GList *iter;
res = NULL;
- while (start != NULL && start != end)
+
+ for (iter = uris; iter; iter = iter->next)
{
- file = g_file_new_for_uri ((char *)start->data);
+ GFile *file = g_file_new_for_uri ((char *)iter->data);
res = g_list_prepend (res, file);
- start = start->next;
}
return g_list_reverse (res);
typedef struct
{
+ GSpawnChildSetupFunc user_setup;
+ gpointer user_setup_data;
char *display;
char *sn_id;
char *desktop_file;
g_snprintf (pid, 20, "%ld", (long)getpid ());
g_setenv ("GIO_LAUNCHED_DESKTOP_FILE_PID", pid, TRUE);
}
+
+ if (data->user_setup)
+ data->user_setup (data->user_setup_data);
}
+static void
+notify_desktop_launch (GDBusConnection *session_bus,
+ GDesktopAppInfo *info,
+ long pid,
+ const char *display,
+ const char *sn_id,
+ GList *uris)
+{
+ GDBusMessage *msg;
+ GVariantBuilder uri_variant;
+ GVariantBuilder extras_variant;
+ GList *iter;
+ const char *desktop_file_id;
+ const char *gio_desktop_file;
+
+ if (session_bus == NULL)
+ return;
+
+ g_variant_builder_init (&uri_variant, G_VARIANT_TYPE ("as"));
+ for (iter = uris; iter; iter = iter->next)
+ g_variant_builder_add (&uri_variant, "s", iter->data);
+
+ g_variant_builder_init (&extras_variant, G_VARIANT_TYPE ("a{sv}"));
+ if (sn_id != NULL && g_utf8_validate (sn_id, -1, NULL))
+ g_variant_builder_add (&extras_variant, "{sv}",
+ "startup-id",
+ g_variant_new ("s",
+ sn_id));
+ gio_desktop_file = g_getenv ("GIO_LAUNCHED_DESKTOP_FILE");
+ if (gio_desktop_file != NULL)
+ g_variant_builder_add (&extras_variant, "{sv}",
+ "origin-desktop-file",
+ g_variant_new_bytestring (gio_desktop_file));
+ if (g_get_prgname () != NULL)
+ g_variant_builder_add (&extras_variant, "{sv}",
+ "origin-prgname",
+ g_variant_new_bytestring (g_get_prgname ()));
+ g_variant_builder_add (&extras_variant, "{sv}",
+ "origin-pid",
+ g_variant_new ("x",
+ (gint64)getpid ()));
+
+ if (info->filename)
+ desktop_file_id = info->filename;
+ else if (info->desktop_id)
+ desktop_file_id = info->desktop_id;
+ else
+ desktop_file_id = "";
+
+ msg = g_dbus_message_new_signal ("/org/gtk/gio/DesktopAppInfo",
+ "org.gtk.gio.DesktopAppInfo",
+ "Launched");
+ g_dbus_message_set_body (msg, g_variant_new ("(@aysxasa{sv})",
+ g_variant_new_bytestring (desktop_file_id),
+ display ? display : "",
+ (gint64)pid,
+ &uri_variant,
+ &extras_variant));
+ g_dbus_connection_send_message (session_bus,
+ msg, 0,
+ NULL,
+ NULL);
+ g_object_unref (msg);
+}
+
+#define _SPAWN_FLAGS_DEFAULT (G_SPAWN_SEARCH_PATH)
+
static gboolean
-g_desktop_app_info_launch_uris (GAppInfo *appinfo,
- GList *uris,
- GAppLaunchContext *launch_context,
- GError **error)
+_g_desktop_app_info_launch_uris_internal (GAppInfo *appinfo,
+ GList *uris,
+ GAppLaunchContext *launch_context,
+ GSpawnFlags spawn_flags,
+ GSpawnChildSetupFunc user_setup,
+ gpointer user_setup_data,
+ GDesktopAppLaunchCallback pid_callback,
+ gpointer pid_callback_data,
+ GError **error)
{
GDesktopAppInfo *info = G_DESKTOP_APP_INFO (appinfo);
+ GDBusConnection *session_bus;
gboolean completed = FALSE;
GList *old_uris;
- GList *launched_files;
char **argv;
int argc;
ChildSetupData data;
argv = NULL;
+ session_bus = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, NULL);
+
do
{
+ GPid pid;
+ GList *launched_uris;
+ GList *iter;
+
old_uris = uris;
if (!expand_application_parameters (info, &uris,
&argc, &argv, error))
goto out;
+
+ /* Get the subset of URIs we're launching with this process */
+ launched_uris = NULL;
+ for (iter = old_uris; iter != NULL && iter != uris; iter = iter->next)
+ launched_uris = g_list_prepend (launched_uris, iter->data);
+ launched_uris = g_list_reverse (launched_uris);
if (info->terminal && !prepend_terminal_to_vector (&argc, &argv))
{
goto out;
}
+ data.user_setup = user_setup;
+ data.user_setup_data = user_setup_data;
data.display = NULL;
data.sn_id = NULL;
data.desktop_file = info->filename;
if (launch_context)
{
- launched_files = uri_list_segment_to_files (old_uris, uris);
+ GList *launched_files = create_files_for_uris (launched_uris);
data.display = g_app_launch_context_get_display (launch_context,
appinfo,
if (!g_spawn_async (info->path,
argv,
NULL,
- G_SPAWN_SEARCH_PATH,
+ spawn_flags,
child_setup,
&data,
- NULL,
+ &pid,
error))
{
if (data.sn_id)
g_free (data.sn_id);
g_free (data.display);
+ g_list_free (launched_uris);
goto out;
}
+ if (pid_callback != NULL)
+ pid_callback (info, pid, pid_callback_data);
+
+ notify_desktop_launch (session_bus,
+ info,
+ pid,
+ data.display,
+ data.sn_id,
+ launched_uris);
+
g_free (data.sn_id);
g_free (data.display);
+ g_list_free (launched_uris);
g_strfreev (argv);
argv = NULL;
}
while (uris != NULL);
+ /* TODO - need to handle the process exiting immediately
+ * after launching an app. See http://bugzilla.gnome.org/606960
+ */
+ if (session_bus != NULL)
+ {
+ /* This asynchronous flush holds a reference until it completes,
+ * which ensures that the following unref won't immediately kill
+ * the connection if we were the initial owner.
+ */
+ g_dbus_connection_flush (session_bus, NULL, NULL, NULL);
+ g_object_unref (session_bus);
+ }
+
completed = TRUE;
out:
}
static gboolean
+g_desktop_app_info_launch_uris (GAppInfo *appinfo,
+ GList *uris,
+ GAppLaunchContext *launch_context,
+ GError **error)
+{
+ return _g_desktop_app_info_launch_uris_internal (appinfo, uris,
+ launch_context,
+ _SPAWN_FLAGS_DEFAULT,
+ NULL, NULL, NULL, NULL,
+ error);
+}
+
+static gboolean
g_desktop_app_info_supports_uris (GAppInfo *appinfo)
{
GDesktopAppInfo *info = G_DESKTOP_APP_INFO (appinfo);
return res;
}
-G_LOCK_DEFINE_STATIC (g_desktop_env);
-static gchar *g_desktop_env = NULL;
+/**
+ * g_desktop_app_info_launch_uris_as_manager:
+ * @appinfo: a #GDesktopAppInfo
+ * @uris: (element-type utf8): List of URIs
+ * @launch_context: a #GAppLaunchContext
+ * @spawn_flags: #GSpawnFlags, used for each process
+ * @user_setup: (scope call): a #GSpawnChildSetupFunc, used once for
+ * each process.
+ * @user_setup_data: (closure user_setup): User data for @user_setup
+ * @pid_callback: (scope call): Callback for child processes
+ * @pid_callback_data: (closure pid_callback): User data for @callback
+ * @error: return location for a #GError, or %NULL
+ *
+ * This function performs the equivalent of g_app_info_launch_uris(),
+ * but is intended primarily for operating system components that
+ * launch applications. Ordinary applications should use
+ * g_app_info_launch_uris().
+ *
+ * In contrast to g_app_info_launch_uris(), all processes created will
+ * always be run directly as children as if by the UNIX fork()/exec()
+ * calls.
+ *
+ * This guarantee allows additional control over the exact environment
+ * of the child processes, which is provided via a setup function
+ * @setup, as well as the process identifier of each child process via
+ * @pid_callback. See g_spawn_async() for more information about the
+ * semantics of the @setup function.
+ *
+ * Returns: %TRUE on successful launch, %FALSE otherwise.
+ */
+gboolean
+g_desktop_app_info_launch_uris_as_manager (GDesktopAppInfo *appinfo,
+ GList *uris,
+ GAppLaunchContext *launch_context,
+ GSpawnFlags spawn_flags,
+ GSpawnChildSetupFunc user_setup,
+ gpointer user_setup_data,
+ GDesktopAppLaunchCallback pid_callback,
+ gpointer pid_callback_data,
+ GError **error)
+{
+ return _g_desktop_app_info_launch_uris_internal ((GAppInfo*)appinfo,
+ uris,
+ launch_context,
+ spawn_flags,
+ user_setup,
+ user_setup_data,
+ pid_callback,
+ pid_callback_data,
+ error);
+}
/**
* g_desktop_app_info_set_desktop_env:
* @desktop_env: a string specifying what desktop this is
*
* Sets the name of the desktop that the application is running in.
- * This is used by g_app_info_should_show() to evaluate the
+ * This is used by g_app_info_should_show() and
+ * g_desktop_app_info_get_show_in() to evaluate the
* <literal>OnlyShowIn</literal> and <literal>NotShowIn</literal>
* desktop entry fields.
*
- * The <ulink url="http://standards.freedesktop.org/menu-spec/latest/">Desktop
+ * The <ulink url="http://standards.freedesktop.org/menu-spec/latest/">Desktop
* Menu specification</ulink> recognizes the following:
* <simplelist>
* <member>GNOME</member>
* <member>KDE</member>
* <member>ROX</member>
* <member>XFCE</member>
- * <member>Old</member>
+ * <member>LXDE</member>
+ * <member>Unity</member>
+ * <member>Old</member>
* </simplelist>
*
* Should be called only once; subsequent calls are ignored.
g_desktop_app_info_should_show (GAppInfo *appinfo)
{
GDesktopAppInfo *info = G_DESKTOP_APP_INFO (appinfo);
- gboolean found;
- const gchar *desktop_env;
- int i;
if (info->nodisplay)
return FALSE;
- G_LOCK (g_desktop_env);
- desktop_env = g_desktop_env;
- G_UNLOCK (g_desktop_env);
-
- if (info->only_show_in)
- {
- if (desktop_env == NULL)
- return FALSE;
-
- found = FALSE;
- for (i = 0; info->only_show_in[i] != NULL; i++)
- {
- if (strcmp (info->only_show_in[i], desktop_env) == 0)
- {
- found = TRUE;
- break;
- }
- }
- if (!found)
- return FALSE;
- }
-
- if (info->not_show_in && desktop_env)
- {
- for (i = 0; info->not_show_in[i] != NULL; i++)
- {
- if (strcmp (info->not_show_in[i], desktop_env) == 0)
- return FALSE;
- }
- }
-
- return TRUE;
+ return g_desktop_app_info_get_show_in (info, NULL);
}
typedef enum {
{
char *dirname, *filename, *string;
GKeyFile *key_file;
- gboolean load_succeeded, res, explicit_default;
+ gboolean load_succeeded, res;
char **old_list, **list;
- GList *system_list;
gsize length, data_size;
char *data;
int i, j, k;
key_file = g_key_file_new ();
load_succeeded = g_key_file_load_from_file (key_file, filename, G_KEY_FILE_NONE, NULL);
- if (!load_succeeded || !g_key_file_has_group (key_file, ADDED_ASSOCIATIONS_GROUP))
+ if (!load_succeeded ||
+ (!g_key_file_has_group (key_file, ADDED_ASSOCIATIONS_GROUP) &&
+ !g_key_file_has_group (key_file, REMOVED_ASSOCIATIONS_GROUP) &&
+ !g_key_file_has_group (key_file, DEFAULT_APPLICATIONS_GROUP)))
{
g_key_file_free (key_file);
key_file = g_key_file_new ();
content_types = g_key_file_get_keys (key_file, DEFAULT_APPLICATIONS_GROUP, NULL, NULL);
}
- explicit_default = FALSE;
-
for (k = 0; content_types && content_types[k]; k++)
{
/* set as default, if requested so */
content_types[k],
NULL);
else
- {
- g_key_file_set_string (key_file,
- DEFAULT_APPLICATIONS_GROUP,
- content_types[k],
- string);
-
- explicit_default = TRUE;
- }
+ g_key_file_set_string (key_file,
+ DEFAULT_APPLICATIONS_GROUP,
+ content_types[k],
+ string);
g_free (string);
}
content_types[k],
NULL);
else
- {
- g_key_file_set_string_list (key_file,
- ADDED_ASSOCIATIONS_GROUP,
- content_types[k],
- (const char * const *)list, i);
-
- /* if we had no explicit default set, we should add the system default to the
- * list, to avoid overriding it with applications from this list.
- */
- if (!explicit_default)
- {
- system_list = get_all_desktop_entries_for_mime_type (content_type, (const char **) list, FALSE, NULL);
-
- if (system_list != NULL)
- {
- string = system_list->data;
-
- g_key_file_set_string (key_file,
- DEFAULT_APPLICATIONS_GROUP,
- content_types[k],
- string);
- }
+ g_key_file_set_string_list (key_file,
+ ADDED_ASSOCIATIONS_GROUP,
+ content_types[k],
+ (const char * const *)list, i);
- g_list_free_full (system_list, g_free);
- }
- }
-
g_strfreev (list);
}
g_strfreev (list);
}
- g_strfreev (content_types);
+ g_strfreev (content_types);
data = g_key_file_to_data (key_file, &data_size, error);
g_key_file_free (key_file);
-
+
res = g_file_set_contents (filename, data, data_size, error);
mime_info_cache_reload (NULL);
-
+
g_free (filename);
g_free (data);
-
+
return res;
}
if (!g_desktop_app_info_ensure_saved (info, error))
return FALSE;
+ if (!info->desktop_id)
+ {
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Application information lacks an identifier"));
+ return FALSE;
+ }
+
/* both add support for the content type and set as last used */
return update_mimeapps_list (info->desktop_id, content_type,
UPDATE_MIME_SET_NON_DEFAULT |
GDesktopAppInfo *info = G_DESKTOP_APP_INFO (appinfo);
if (!g_desktop_app_info_ensure_saved (info, error))
- return FALSE;
-
+ return FALSE;
+
+ if (!info->desktop_id)
+ {
+ g_set_error_literal (error, G_IO_ERROR, G_IO_ERROR_FAILED,
+ _("Application information lacks an identifier"));
+ return FALSE;
+ }
+
return update_mimeapps_list (info->desktop_id, content_type,
UPDATE_MIME_SET_DEFAULT,
error);
if (info->terminal)
g_key_file_set_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_TERMINAL, TRUE);
+ if (info->nodisplay)
+ g_key_file_set_boolean (key_file, G_KEY_FILE_DESKTOP_GROUP,
+ G_KEY_FILE_DESKTOP_KEY_NO_DISPLAY, TRUE);
g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_EXEC, info->exec);
g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
G_KEY_FILE_DESKTOP_KEY_NAME, info->name);
+ if (info->generic_name != NULL)
+ g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
+ GENERIC_NAME_KEY, info->generic_name);
+
if (info->fullname != NULL)
g_key_file_set_string (key_file, G_KEY_FILE_DESKTOP_GROUP,
FULL_NAME_KEY, info->fullname);
* @commandline: the commandline to use
* @application_name: (allow-none): the application name, or %NULL to use @commandline
* @flags: flags that can specify details of the created #GAppInfo
- * @error: a #GError location to store the error occuring, %NULL to ignore.
+ * @error: a #GError location to store the error occurring, %NULL to ignore.
*
* Creates a new #GAppInfo from the given information.
*
info->filename = NULL;
info->desktop_id = NULL;
- info->terminal = flags & G_APP_INFO_CREATE_NEEDS_TERMINAL;
- info->startup_notify = flags & G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION;
+ info->terminal = (flags & G_APP_INFO_CREATE_NEEDS_TERMINAL) != 0;
+ info->startup_notify = (flags & G_APP_INFO_CREATE_SUPPORTS_STARTUP_NOTIFICATION) != 0;
info->hidden = FALSE;
- if (flags & G_APP_INFO_CREATE_SUPPORTS_URIS)
+ if ((flags & G_APP_INFO_CREATE_SUPPORTS_URIS) != 0)
info->exec = g_strconcat (commandline, " %u", NULL);
else
info->exec = g_strconcat (commandline, " %f", NULL);
* those applications which claim to support the given content type exactly,
* and not by MIME type subclassing.
* Note that the first application of the list is the last used one, i.e.
- * the last one for which #g_app_info_set_as_last_used_for_type has been
+ * the last one for which g_app_info_set_as_last_used_for_type() has been
* called.
*
* Returns: (element-type GAppInfo) (transfer full): #GList of #GAppInfos
/**
* g_app_info_get_all_for_type:
* @content_type: the content type to find a #GAppInfo for
- *
- * Gets a list of all #GAppInfos for a given content type.
+ *
+ * Gets a list of all #GAppInfos for a given content type,
+ * including the recommended and fallback #GAppInfos. See
+ * g_app_info_get_recommended_for_type() and
+ * g_app_info_get_fallback_for_type().
*
* Returns: (element-type GAppInfo) (transfer full): #GList of #GAppInfos
* for given @content_type or %NULL on error.
/**
* g_app_info_reset_type_associations:
- * @content_type: a content type
+ * @content_type: a content type
*
* Removes all changes to the type associations done by
- * g_app_info_set_as_default_for_type(),
- * g_app_info_set_as_default_for_extension(),
- * g_app_info_add_supports_type() or g_app_info_remove_supports_type().
+ * g_app_info_set_as_default_for_type(),
+ * g_app_info_set_as_default_for_extension(),
+ * g_app_info_add_supports_type() or
+ * g_app_info_remove_supports_type().
*
* Since: 2.20
*/
* @content_type: the content type to find a #GAppInfo for
* @must_support_uris: if %TRUE, the #GAppInfo is expected to
* support URIs
- *
- * Gets the #GAppInfo that corresponds to a given content type.
*
- * Returns: #GAppInfo for given @content_type or %NULL on error.
- **/
+ * Gets the default #GAppInfo for a given content type.
+ *
+ * Returns: (transfer full): #GAppInfo for given @content_type or
+ * %NULL on error.
+ */
GAppInfo *
g_app_info_get_default_for_type (const char *content_type,
gboolean must_support_uris)
* g_app_info_get_default_for_uri_scheme:
* @uri_scheme: a string containing a URI scheme.
*
- * Gets the default application for launching applications
- * using this URI scheme. A URI scheme is the initial part
- * of the URI, up to but not including the ':', e.g. "http",
+ * Gets the default application for handling URIs with
+ * the given URI scheme. A URI scheme is the initial part
+ * of the URI, up to but not including the ':', e.g. "http",
* "ftp" or "sip".
- *
- * Returns: #GAppInfo for given @uri_scheme or %NULL on error.
- **/
+ *
+ * Returns: (transfer full): #GAppInfo for given @uri_scheme or %NULL on error.
+ */
GAppInfo *
g_app_info_get_default_for_uri_scheme (const char *uri_scheme)
{
GList *desktop_entries, *removed_entries, *list, *dir_list, *tmp;
MimeInfoCacheDir *dir;
char *mime_type, *default_entry = NULL;
+ char *old_default_entry = NULL;
const char *entry;
char **mime_types;
char **default_entries;
{
dir = dir_list->data;
- /* Pick the explicit default application */
- entry = g_hash_table_lookup (dir->mimeapps_list_defaults_map, mime_type);
-
- if (entry != NULL)
+ /* Pick the explicit default application if we got no result earlier
+ * (ie, for more specific mime types)
+ */
+ if (desktop_entries == NULL)
{
- /* Save the default entry if it's the first one we encounter */
- if (default_entry == NULL)
- default_entry = g_strdup (entry);
+ entry = g_hash_table_lookup (dir->mimeapps_list_defaults_map, mime_type);
+
+ if (entry != NULL)
+ {
+ /* Save the default entry if it's the first one we encounter */
+ if (default_entry == NULL)
+ default_entry = g_strdup (entry);
+ }
}
/* Then added associations from mimeapps.list */
/* Then system defaults (or old per-user config) (using removed associations from this dir or earlier) */
default_entries = g_hash_table_lookup (dir->defaults_list_map, mime_type);
for (j = 0; default_entries != NULL && default_entries[j] != NULL; j++)
- desktop_entries = append_desktop_entry (desktop_entries, default_entries[j], removed_entries);
+ {
+ if (default_entry == NULL && old_default_entry == NULL)
+ old_default_entry = g_strdup (default_entries[j]);
+
+ desktop_entries = append_desktop_entry (desktop_entries, default_entries[j], removed_entries);
+ }
}
/* Go through all entries that support the mimetype */
g_strfreev (mime_types);
+ /* If we have no default from mimeapps.list, take it from
+ * defaults.list intead.
+ *
+ * If we do have a default from mimeapps.list, free any one that came
+ * from defaults.list.
+ */
+ if (default_entry == NULL)
+ default_entry = old_default_entry;
+ else
+ g_free (old_default_entry);
+
if (explicit_default != NULL)
*explicit_default = default_entry;
else