AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bug 506062 – gtk_recent_manager_add_item does not detect mime type on

Browse Source 
2008-04-15  Emmanuele Bassi  <ebassi@gnome.org>

	Bug 506062 – gtk_recent_manager_add_item does not detect mime
	type on Windows

	* configure.in: Depend on gio-2.0

	* gtk/gtkrecentmanager.c:
	(gtk_recent_manager_add_item_query_info_cb),
	(gtk_recent_manager_add_item): Use GIO to (asynchronously) query
	the MIME type of the passed URI.

svn path=/trunk/; revision=20003
This commit is contained in:
Emmanuele Bassi 2008-04-15 22:00:17 +00:00 committed by Emmanuele Bassi
parent b3a7e8924d
commit 9b2656f793
3 changed files with 83 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ChangeLog
View File

@ -1,3 +1,15 @@
2008-04-15 Emmanuele Bassi <ebassi@gnome.org>
Bug 506062 – gtk_recent_manager_add_item does not detect mime
type on Windows
* configure.in: Depend on gio-2.0
* gtk/gtkrecentmanager.c:
(gtk_recent_manager_add_item_query_info_cb),
(gtk_recent_manager_add_item): Use GIO to (asynchronously) query
the MIME type of the passed URI.
2008-04-11 Carlos Garnacho <carlos@imendio.com>D:ChangeLog 2008-04-11 Carlos Garnacho <carlos@imendio.com>D:ChangeLog
* gtk/gtkassistant.c (gtk_assistant_set_current_page): Add current * gtk/gtkassistant.c (gtk_assistant_set_current_page): Add current

2
configure.in
View File

@ -1674,7 +1674,7 @@ else
LIBS="$gtk_save_LIBS" LIBS="$gtk_save_LIBS"
fi fi
GTK_PACKAGES="atk cairo" GTK_PACKAGES="atk cairo gio-2.0"
GTK_EXTRA_LIBS= GTK_EXTRA_LIBS=
GTK_EXTRA_CFLAGS= GTK_EXTRA_CFLAGS=
GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS" GTK_DEP_LIBS="$GDK_EXTRA_LIBS $GTK_DEP_LIBS_FOR_X `$PKG_CONFIG --libs $GDK_PIXBUF_PACKAGES $PANGO_PACKAGES $GTK_PACKAGES_FOR_X $GTK_PACKAGES` $GTK_EXTRA_LIBS $GDK_PIXBUF_EXTRA_LIBS"

107
gtk/gtkrecentmanager.c
View File

@ -30,6 +30,7 @@
#include <stdlib.h> #include <stdlib.h>
#include <glib.h> #include <glib.h>
#include <glib/gstdio.h> #include <glib/gstdio.h>
#include <gio/gio.h>
#include "gtkrecentmanager.h" #include "gtkrecentmanager.h"
#include "gtkintl.h" #include "gtkintl.h"
@ -136,6 +137,9 @@ static void gtk_recent_manager_get_property (GObject *ob
guint prop_id, guint prop_id,
GValue *value, GValue *value,
GParamSpec *pspec); GParamSpec *pspec);
static void gtk_recent_manager_add_item_query_info_cb (GObject *source_object,
GAsyncResult *res,
gpointer user_data);
static void gtk_recent_manager_changed (GtkRecentManager *manager); static void gtk_recent_manager_changed (GtkRecentManager *manager);
static void gtk_recent_manager_real_changed (GtkRecentManager *manager); static void gtk_recent_manager_real_changed (GtkRecentManager *manager);
@ -797,6 +801,60 @@ gtk_recent_manager_get_limit (GtkRecentManager *manager)
return priv->limit; return priv->limit;
} }
static void
gtk_recent_manager_add_item_query_info_cb (GObject *source_object,
GAsyncResult *res,
gpointer user_data)
{
GFile *file = G_FILE (source_object);
GtkRecentManager *manager = user_data;
GtkRecentData recent_data;
GFileInfo *file_info;
gchar *uri;
GError *error;
uri = g_file_get_uri (file);
error = NULL;
file_info = g_file_query_info_finish (file, res, &error);
if (error)
{
g_warning ("Unable to retrieve the file info for `%s': %s",
uri,
error->message);
g_error_free (error);
goto out;
}
recent_data.display_name = NULL;
recent_data.description = NULL;
if (file_info)
{
recent_data.mime_type = g_content_type_get_mime_type (g_file_info_get_content_type (file_info));
g_object_unref (file_info);
}
else
recent_data.mime_type = g_strdup (GTK_RECENT_DEFAULT_MIME);
recent_data.app_name = g_strdup (g_get_application_name ());
recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
recent_data.groups = NULL;
recent_data.is_private = FALSE;
/* Ignore return value, this can't fail anyway since all required
* fields are set */
gtk_recent_manager_add_full (manager, uri, &recent_data);
g_free (recent_data.mime_type);
g_free (recent_data.app_name);
g_free (recent_data.app_exec);
out:
g_object_unref (manager);
g_free (uri);
}
/** /**
* gtk_recent_manager_add_item: * gtk_recent_manager_add_item:
* @manager: a #GtkRecentManager * @manager: a #GtkRecentManager
@ -821,51 +879,24 @@ gboolean
gtk_recent_manager_add_item (GtkRecentManager *manager, gtk_recent_manager_add_item (GtkRecentManager *manager,
const gchar *uri) const gchar *uri)
{ {
GtkRecentData recent_data; GFile* file;
gboolean retval;
g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), FALSE); g_return_val_if_fail (GTK_IS_RECENT_MANAGER (manager), FALSE);
g_return_val_if_fail (uri != NULL, FALSE); g_return_val_if_fail (uri != NULL, FALSE);
recent_data.display_name = NULL; file = g_file_new_for_uri (uri);
recent_data.description = NULL;
recent_data.mime_type = NULL;
#ifdef G_OS_UNIX g_file_query_info_async (file,
if (has_case_prefix (uri, "file:/")) G_FILE_ATTRIBUTE_STANDARD_FAST_CONTENT_TYPE,
{ G_PRIORITY_DEFAULT,
gchar *filename; G_FILE_QUERY_INFO_NONE,
const gchar *mime_type; NULL,
gtk_recent_manager_add_item_query_info_cb,
g_object_ref (manager));
filename = g_filename_from_uri (uri, NULL, NULL); g_object_unref (file);
if (filename)
{
mime_type = xdg_mime_get_mime_type_for_file (filename, NULL);
if (mime_type)
recent_data.mime_type = g_strdup (mime_type);
g_free (filename); return TRUE;
}
if (!recent_data.mime_type)
recent_data.mime_type = g_strdup (GTK_RECENT_DEFAULT_MIME);
}
else
#endif
recent_data.mime_type = g_strdup (GTK_RECENT_DEFAULT_MIME);
recent_data.app_name = g_strdup (g_get_application_name ());
recent_data.app_exec = g_strjoin (" ", g_get_prgname (), "%u", NULL);
recent_data.groups = NULL;
recent_data.is_private = FALSE;
retval = gtk_recent_manager_add_full (manager, uri, &recent_data);
g_free (recent_data.mime_type);
g_free (recent_data.app_name);
g_free (recent_data.app_exec);
return retval;
} }
/** /**