[totem] grilo: Split out icon helper functions
- From: Bastien Nocera <hadess src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [totem] grilo: Split out icon helper functions
- Date: Tue, 9 Jul 2013 10:37:01 +0000 (UTC)
commit c435914229570be00bc52937aec0f7f214035c9f
Author: Bastien Nocera <hadess hadess net>
Date: Tue Jul 9 12:34:53 2013 +0200
grilo: Split out icon helper functions
src/plugins/grilo/Makefile.am | 4 +-
src/plugins/grilo/icon-helpers.c | 264 ++++++++++++++++++++++++++++++++++++++
src/plugins/grilo/icon-helpers.h | 43 ++++++
src/plugins/grilo/totem-grilo.c | 227 ++++++--------------------------
4 files changed, 352 insertions(+), 186 deletions(-)
---
diff --git a/src/plugins/grilo/Makefile.am b/src/plugins/grilo/Makefile.am
index c8678ff..93644c8 100644
--- a/src/plugins/grilo/Makefile.am
+++ b/src/plugins/grilo/Makefile.am
@@ -16,7 +16,9 @@ EXTRA_DIST += $(conf_DATA)
libgrilo_la_SOURCES = \
totem-grilo.c \
totem-search-entry.c \
- totem-search-entry.h
+ totem-search-entry.h \
+ icon-helpers.c \
+ icon-helpers.h
libgrilo_la_LDFLAGS = $(plugin_ldflags)
libgrilo_la_LIBADD = \
diff --git a/src/plugins/grilo/icon-helpers.c b/src/plugins/grilo/icon-helpers.c
new file mode 100644
index 0000000..3178229
--- /dev/null
+++ b/src/plugins/grilo/icon-helpers.c
@@ -0,0 +1,264 @@
+/*
+ * Copyright (C) 2013 Bastien Nocera <hadess hadess net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#include <icon-helpers.h>
+
+#define THUMB_SEARCH_SIZE 128
+#define THUMB_SEARCH_HEIGHT (THUMB_SEARCH_SIZE / 4 * 3)
+
+typedef enum {
+ ICON_BOX = 0,
+ ICON_VIDEO,
+ ICON_VIDEO_THUMBNAILING,
+ NUM_ICONS
+} IconType;
+
+static GdkPixbuf *icons[NUM_ICONS];
+static GHashTable *cache_thumbnails; /* key=url, value=GdkPixbuf */
+
+GdkPixbuf *
+totem_grilo_get_thumbnail_finish (GAsyncResult *res,
+ GError **error)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (res);
+
+ g_warn_if_fail (g_simple_async_result_get_source_tag (simple) == totem_grilo_get_thumbnail);
+
+ if (g_simple_async_result_propagate_error (simple, error))
+ return NULL;
+
+ return g_simple_async_result_get_op_res_gpointer (simple);
+}
+
+static void
+load_thumbnail_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
+ GdkPixbuf *pixbuf;
+ GError *error = NULL;
+ const GFile *file;
+
+ pixbuf = gdk_pixbuf_new_from_stream_finish (res, &error);
+ if (!pixbuf) {
+ g_simple_async_result_take_error (simple, error);
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (res);
+ return;
+ }
+
+ /* Cache it */
+ file = g_object_get_data (source_object, "file");
+ if (file) {
+ g_hash_table_insert (cache_thumbnails,
+ g_file_get_uri (G_FILE (file)),
+ g_object_ref (pixbuf));
+ }
+
+ g_simple_async_result_set_op_res_gpointer (simple, pixbuf, NULL);
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
+}
+
+static void
+get_stream_thumbnail_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple = G_SIMPLE_ASYNC_RESULT (user_data);
+ GFileInputStream *stream;
+ GCancellable *cancellable;
+ GError *error = NULL;
+
+ stream = g_file_read_finish (G_FILE (source_object), res, &error);
+ if (!stream) {
+ g_simple_async_result_take_error (simple, error);
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (res);
+ return;
+ }
+
+ cancellable = g_object_get_data (G_OBJECT (simple), "cancellable");
+ gdk_pixbuf_new_from_stream_at_scale_async (G_INPUT_STREAM (stream),
+ THUMB_SEARCH_SIZE,
+ THUMB_SEARCH_SIZE,
+ TRUE,
+ cancellable,
+ load_thumbnail_cb,
+ simple);
+ g_object_unref (G_OBJECT (stream));
+}
+
+void
+totem_grilo_get_thumbnail (GrlMedia *media,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data)
+{
+ GSimpleAsyncResult *simple;
+ const char *url_thumb;
+ const GdkPixbuf *thumbnail;
+ GFile *file;
+
+ url_thumb = grl_media_get_thumbnail (media);
+ g_return_if_fail (url_thumb != NULL);
+
+ simple = g_simple_async_result_new (G_OBJECT (media),
+ callback,
+ user_data,
+ totem_grilo_get_thumbnail);
+
+ /* Check cache */
+ thumbnail = g_hash_table_lookup (cache_thumbnails, url_thumb);
+ if (thumbnail) {
+ g_simple_async_result_set_op_res_gpointer (simple, g_object_ref (G_OBJECT (thumbnail)), NULL);
+ g_simple_async_result_complete_in_idle (simple);
+ g_object_unref (simple);
+ return;
+ }
+
+ file = g_file_new_for_uri (url_thumb);
+ g_object_set_data_full (G_OBJECT (simple), "file", file, g_object_unref);
+ g_object_set_data (G_OBJECT (simple), "cancellable", cancellable);
+ g_file_read_async (file, G_PRIORITY_DEFAULT, NULL,
+ get_stream_thumbnail_cb, simple);
+}
+
+static void
+put_pixel (guchar *p)
+{
+ p[0] = 46;
+ p[1] = 52;
+ p[2] = 54;
+ p[3] = 0xff;
+}
+
+static GdkPixbuf *
+load_icon (Totem *totem,
+ const char *name,
+ int size,
+ gboolean with_border)
+{
+ GdkScreen *screen;
+ GtkIconTheme *theme;
+ GdkPixbuf *icon, *ret;
+ guchar *pixels;
+ int rowstride;
+ int x, y;
+
+ screen = gtk_window_get_screen (totem_object_get_main_window (totem));
+ theme = gtk_icon_theme_get_for_screen (screen);
+ icon = gtk_icon_theme_load_icon (theme, name, size, 0, NULL);
+
+ ret = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
+ TRUE,
+ 8, THUMB_SEARCH_SIZE, THUMB_SEARCH_HEIGHT);
+ pixels = gdk_pixbuf_get_pixels (ret);
+ rowstride = gdk_pixbuf_get_rowstride (ret);
+
+ /* Clean up */
+ gdk_pixbuf_fill (ret, 0x00000000);
+
+ /* Draw a border */
+ if (with_border) {
+ for (x = 0; x < THUMB_SEARCH_SIZE; x++)
+ put_pixel (pixels + x * 4);
+ for (x = 0; x < THUMB_SEARCH_SIZE; x++)
+ put_pixel (pixels + (THUMB_SEARCH_HEIGHT -1) * rowstride + x * 4);
+ for (y = 1; y < THUMB_SEARCH_HEIGHT - 1; y++)
+ put_pixel (pixels + y * rowstride);
+ for (y = 1; y < THUMB_SEARCH_HEIGHT - 1; y++)
+ put_pixel (pixels + y * rowstride + (THUMB_SEARCH_SIZE - 1) * 4);
+ }
+
+ /* Put the icon in the middle */
+ gdk_pixbuf_copy_area (icon, 0, 0,
+ gdk_pixbuf_get_width (icon), gdk_pixbuf_get_height (icon),
+ ret,
+ (THUMB_SEARCH_SIZE - gdk_pixbuf_get_width (icon)) / 2,
+ (THUMB_SEARCH_HEIGHT - gdk_pixbuf_get_height (icon)) / 2);
+
+ g_object_unref (icon);
+
+ return ret;
+}
+
+GdkPixbuf *
+totem_grilo_get_icon (GrlMedia *media,
+ gboolean *thumbnailing)
+{
+ *thumbnailing = FALSE;
+
+ if (GRL_IS_MEDIA_BOX (media))
+ return g_object_ref (icons[ICON_BOX]);
+ else if (GRL_IS_MEDIA_VIDEO (media)) {
+ if (grl_media_get_thumbnail (media)) {
+ *thumbnailing = TRUE;
+ return g_object_ref (icons[ICON_VIDEO_THUMBNAILING]);
+ } else {
+ return g_object_ref (icons[ICON_VIDEO]);
+ }
+ }
+ return NULL;
+}
+
+const GdkPixbuf *
+totem_grilo_get_video_icon (void)
+{
+ return icons[ICON_VIDEO];
+}
+
+const GdkPixbuf *
+totem_grilo_get_box_icon (void)
+{
+ return icons[ICON_BOX];
+}
+
+void
+totem_grilo_clear_icons (void)
+{
+ guint i;
+
+ for (i = 0; i < NUM_ICONS; i++)
+ g_clear_object (&icons[i]);
+
+ g_clear_pointer (&cache_thumbnails, g_hash_table_destroy);
+}
+
+void
+totem_grilo_setup_icons (Totem *totem)
+{
+ icons[ICON_BOX] = load_icon (totem, "folder-symbolic", THUMB_SEARCH_HEIGHT, FALSE);
+ icons[ICON_VIDEO] = load_icon (totem, "folder-videos-symbolic", THUMB_SEARCH_HEIGHT, FALSE);
+ icons[ICON_VIDEO_THUMBNAILING] = load_icon (totem, "folder-videos-symbolic", 24, TRUE);
+
+ cache_thumbnails = g_hash_table_new_full (g_str_hash,
+ g_str_equal,
+ g_free,
+ g_object_unref);
+}
diff --git a/src/plugins/grilo/icon-helpers.h b/src/plugins/grilo/icon-helpers.h
new file mode 100644
index 0000000..dc29f3c
--- /dev/null
+++ b/src/plugins/grilo/icon-helpers.h
@@ -0,0 +1,43 @@
+/*
+ * Copyright (C) 2013 Bastien Nocera <hadess hadess net>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * The Totem project hereby grant permission for non-gpl compatible GStreamer
+ * plugins to be used and distributed together with GStreamer and Totem. This
+ * permission are above and beyond the permissions granted by the GPL license
+ * Totem is covered by.
+ *
+ * Monday 7th February 2005: Christian Schaller: Add exception clause.
+ * See license_change file for details.
+ *
+ */
+
+#include <totem.h>
+#include <grilo.h>
+
+void totem_grilo_setup_icons (Totem *self);
+void totem_grilo_clear_icons (void);
+GdkPixbuf *totem_grilo_get_icon (GrlMedia *media,
+ gboolean *thumbnailing);
+const GdkPixbuf *totem_grilo_get_video_icon (void);
+const GdkPixbuf *totem_grilo_get_box_icon (void);
+
+void totem_grilo_get_thumbnail (GrlMedia *media,
+ GCancellable *cancellable,
+ GAsyncReadyCallback callback,
+ gpointer user_data);
+GdkPixbuf *totem_grilo_get_thumbnail_finish (GAsyncResult *res,
+ GError **error);
diff --git a/src/plugins/grilo/totem-grilo.c b/src/plugins/grilo/totem-grilo.c
index 8f23885..e9d8cfe 100644
--- a/src/plugins/grilo/totem-grilo.c
+++ b/src/plugins/grilo/totem-grilo.c
@@ -26,6 +26,7 @@
*/
#include "config.h"
+#include "icon-helpers.h"
#include <time.h>
@@ -74,8 +75,6 @@
#define BROWSE_FLAGS (GRL_RESOLVE_FAST_ONLY | GRL_RESOLVE_IDLE_RELAY)
#define RESOLVE_FLAGS (GRL_RESOLVE_FULL | GRL_RESOLVE_IDLE_RELAY)
#define PAGE_SIZE 50
-#define THUMB_SEARCH_SIZE 128
-#define THUMB_SEARCH_HEIGHT (THUMB_SEARCH_SIZE / 4 * 3)
#define SCROLL_GET_MORE_LIMIT 0.8
#define TOTEM_GRILO_CONFIG_FILE "totem-grilo.conf"
@@ -87,13 +86,6 @@ const gchar *BLACKLIST_SOURCES[] = { "grl-bookmarks",
"grl-podcasts",
NULL };
-typedef enum {
- ICON_BOX = 0,
- ICON_VIDEO,
- ICON_VIDEO_THUMBNAILING,
- NUM_ICONS
-} IconType;
-
typedef struct {
Totem *totem;
GtkWindow *main_window;
@@ -101,11 +93,6 @@ typedef struct {
/* Current media selected in results*/
GrlMedia *selected_media;
- /* Thumb cache to speed up loading: maps url strings to GdkPixbuf thumbnails */
- GHashTable *cache_thumbnails;
- /* Stock icons */
- GdkPixbuf *icons[NUM_ICONS];
-
/* Search related information */
GrlSource *search_source;
guint search_id;
@@ -219,133 +206,44 @@ search_keys (void)
}
static void
-put_pixel (guchar *p)
-{
- p[0] = 46;
- p[1] = 52;
- p[2] = 54;
- p[3] = 0xff;
-}
-
-static GdkPixbuf *
-load_icon (TotemGriloPlugin *self,
- const char *name,
- int size,
- gboolean with_border)
-{
- GdkScreen *screen;
- GtkIconTheme *theme;
- GdkPixbuf *icon, *ret;
- guchar *pixels;
- int rowstride;
- int x, y;
-
- screen = gtk_window_get_screen (totem_object_get_main_window (self->priv->totem));
- theme = gtk_icon_theme_get_for_screen (screen);
- icon = gtk_icon_theme_load_icon (theme, name, size, 0, NULL);
-
- ret = gdk_pixbuf_new (GDK_COLORSPACE_RGB,
- TRUE,
- 8, THUMB_SEARCH_SIZE, THUMB_SEARCH_HEIGHT);
- pixels = gdk_pixbuf_get_pixels (ret);
- rowstride = gdk_pixbuf_get_rowstride (ret);
-
- /* Clean up */
- gdk_pixbuf_fill (ret, 0x00000000);
-
- /* Draw a border */
- if (with_border) {
- for (x = 0; x < THUMB_SEARCH_SIZE; x++)
- put_pixel (pixels + x * 4);
- for (x = 0; x < THUMB_SEARCH_SIZE; x++)
- put_pixel (pixels + (THUMB_SEARCH_HEIGHT -1) * rowstride + x * 4);
- for (y = 1; y < THUMB_SEARCH_HEIGHT - 1; y++)
- put_pixel (pixels + y * rowstride);
- for (y = 1; y < THUMB_SEARCH_HEIGHT - 1; y++)
- put_pixel (pixels + y * rowstride + (THUMB_SEARCH_SIZE - 1) * 4);
- }
-
- /* Put the icon in the middle */
- gdk_pixbuf_copy_area (icon, 0, 0,
- gdk_pixbuf_get_width (icon), gdk_pixbuf_get_height (icon),
- ret,
- (THUMB_SEARCH_SIZE - gdk_pixbuf_get_width (icon)) / 2,
- (THUMB_SEARCH_HEIGHT - gdk_pixbuf_get_height (icon)) / 2);
-
- g_object_unref (icon);
-
- return ret;
-}
-
-static GdkPixbuf *
-get_icon (TotemGriloPlugin *self,
- GrlMedia *media,
- gboolean *thumbnailing)
-{
- *thumbnailing = FALSE;
-
- if (GRL_IS_MEDIA_BOX (media))
- return g_object_ref (self->priv->icons[ICON_BOX]);
- else if (GRL_IS_MEDIA_VIDEO (media)) {
- if (grl_media_get_thumbnail (media)) {
- *thumbnailing = TRUE;
- return g_object_ref (self->priv->icons[ICON_VIDEO_THUMBNAILING]);
- } else {
- return g_object_ref (self->priv->icons[ICON_VIDEO]);
- }
- }
- return NULL;
-}
-
-static void
-get_stream_thumbnail_cb (GObject *source_object,
- GAsyncResult *res,
- gpointer user_data)
+get_thumbnail_cb (GObject *source_object,
+ GAsyncResult *res,
+ gpointer user_data)
{
- GFileInputStream *stream;
- GdkPixbuf *thumbnail = NULL;
GtkTreeIter iter;
SetThumbnailData *thumb_data = (SetThumbnailData *) user_data;
GtkTreePath *path;
+ GdkPixbuf *thumbnail;
+ GtkTreeModel *view_model;
+ GError *error = NULL;
- stream = g_file_read_finish (G_FILE (source_object), res, NULL);
- //FIXME handle cancellation
- if (stream != NULL) {
- //FIXME make it async
- thumbnail = gdk_pixbuf_new_from_stream_at_scale (G_INPUT_STREAM (stream),
- THUMB_SEARCH_SIZE,
- THUMB_SEARCH_SIZE,
- TRUE, NULL, NULL);
- g_object_unref (stream);
- }
+ thumbnail = totem_grilo_get_thumbnail_finish (res, &error);
+ if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_CANCELLED))
+ goto out;
path = gtk_tree_row_reference_get_path (thumb_data->reference);
gtk_tree_model_get_iter (thumb_data->model, &iter, path);
- if (thumbnail) {
- GtkTreeModel *view_model;
-
- gtk_tree_store_set (GTK_TREE_STORE (thumb_data->model),
- &iter,
- GD_MAIN_COLUMN_ICON, thumbnail,
- -1);
-
- /* Cache it */
- g_hash_table_insert (thumb_data->totem_grilo->priv->cache_thumbnails,
- g_file_get_uri (G_FILE (source_object)),
- thumbnail);
-
- /* Can we find that thumbnail in the view model? */
- view_model = gd_main_view_get_model (GD_MAIN_VIEW (thumb_data->totem_grilo->priv->browser));
- if (GTK_IS_TREE_MODEL_FILTER (view_model)) {
- path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER
(view_model),
- path);
- if (gtk_tree_model_get_iter (view_model, &iter, path))
- gtk_tree_model_row_changed (view_model, path, &iter);
- }
+ gtk_tree_store_set (GTK_TREE_STORE (thumb_data->model),
+ &iter,
+ GD_MAIN_COLUMN_ICON, thumbnail ? thumbnail : totem_grilo_get_video_icon (),
+ -1);
+ g_clear_object (&thumbnail);
+
+ /* Can we find that thumbnail in the view model? */
+ view_model = gd_main_view_get_model (GD_MAIN_VIEW (thumb_data->totem_grilo->priv->browser));
+ if (GTK_IS_TREE_MODEL_FILTER (view_model)) {
+ path = gtk_tree_model_filter_convert_child_path_to_path (GTK_TREE_MODEL_FILTER (view_model),
+ path);
+ if (gtk_tree_model_get_iter (view_model, &iter, path))
+ gtk_tree_model_row_changed (view_model, path, &iter);
}
+
gtk_tree_path_free (path);
+out:
+ g_clear_error (&error);
+
/* Free thumb data */
g_object_unref (thumb_data->totem_grilo);
g_object_unref (thumb_data->media);
@@ -360,49 +258,17 @@ set_thumbnail_async (TotemGriloPlugin *self,
GtkTreeModel *model,
GtkTreePath *path)
{
- const gchar *url_thumb;
- GFile *file_uri;
SetThumbnailData *thumb_data;
- GdkPixbuf *thumbnail;
- GtkTreeIter iter;
- url_thumb = grl_media_get_thumbnail (media);
- if (url_thumb != NULL) {
- /* Check cache */
- thumbnail = g_hash_table_lookup (self->priv->cache_thumbnails,
- url_thumb);
- if (thumbnail == NULL) {
- /* Let's read the thumbnail stream and set the thumbnail */
- file_uri = g_file_new_for_uri (url_thumb);
- thumb_data = g_slice_new (SetThumbnailData);
- thumb_data->totem_grilo = g_object_ref (self);
- thumb_data->media = g_object_ref (media);
- thumb_data->model = g_object_ref (model);
- thumb_data->reference = gtk_tree_row_reference_new (model, path);
-
- g_file_read_async (file_uri, G_PRIORITY_DEFAULT, NULL,
- get_stream_thumbnail_cb, thumb_data);
- g_object_unref (file_uri);
- } else {
- /* Use cached thumbnail */
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_tree_store_set (GTK_TREE_STORE (model),
- &iter,
- GD_MAIN_COLUMN_ICON, thumbnail,
- -1);
- }
- } else {
- /* Keep the icon */
- //FIXME that shouldn't happen
- g_assert_not_reached ();
-#if 0
- gtk_tree_model_get_iter (model, &iter, path);
- gtk_tree_store_set (GTK_TREE_STORE (model),
- &iter,
- MODEL_RESULTS_IS_PRETHUMBNAIL, FALSE,
- -1);
-#endif
- }
+ /* Let's read the thumbnail stream and set the thumbnail */
+ thumb_data = g_slice_new (SetThumbnailData);
+ thumb_data->totem_grilo = g_object_ref (self);
+ thumb_data->media = g_object_ref (media);
+ thumb_data->model = g_object_ref (model);
+ thumb_data->reference = gtk_tree_row_reference_new (model, path);
+
+ //FIXME cancellable?
+ totem_grilo_get_thumbnail (media, NULL, get_thumbnail_cb, thumb_data);
}
static gboolean
@@ -520,7 +386,7 @@ browse_cb (GrlSource *source,
goto out;
}
- thumbnail = get_icon (self, media, &thumbnailing);
+ thumbnail = totem_grilo_get_icon (media, &thumbnailing);
secondary = get_secondary_text (media);
gtk_tree_store_insert_with_values (GTK_TREE_STORE (self->priv->browser_model), &iter,
&parent, -1,
@@ -677,7 +543,7 @@ search_cb (GrlSource *source,
goto out;
}
- thumbnail = get_icon (self, media, &thumbnailing);
+ thumbnail = totem_grilo_get_icon (media, &thumbnailing);
secondary = get_secondary_text (media);
gtk_tree_store_insert_with_values (GTK_TREE_STORE (self->priv->search_results_model),
@@ -763,7 +629,7 @@ static void
search (TotemGriloPlugin *self, GrlSource *source, const gchar *text)
{
gtk_tree_store_clear (GTK_TREE_STORE (self->priv->search_results_model));
- g_hash_table_remove_all (self->priv->cache_thumbnails);
+// g_hash_table_remove_all (self->priv->cache_thumbnails);
gtk_widget_set_sensitive (self->priv->search_entry, FALSE);
self->priv->search_source = source;
g_free (self->priv->search_text);
@@ -953,7 +819,7 @@ source_added_cb (GrlRegistry *registry,
if (ops & GRL_OP_BROWSE) {
const GdkPixbuf *icon;
- icon = self->priv->icons[ICON_BOX];
+ icon = totem_grilo_get_box_icon ();
gtk_tree_store_insert_with_values (GTK_TREE_STORE (self->priv->browser_model),
NULL, NULL, -1,
@@ -1413,10 +1279,7 @@ static void
setup_ui (TotemGriloPlugin *self,
GtkBuilder *builder)
{
- self->priv->icons[ICON_BOX] = load_icon (self, "folder-symbolic", THUMB_SEARCH_HEIGHT, FALSE);
- self->priv->icons[ICON_VIDEO] = load_icon (self, "folder-videos-symbolic", THUMB_SEARCH_HEIGHT,
FALSE);
- self->priv->icons[ICON_VIDEO_THUMBNAILING] = load_icon (self, "folder-videos-symbolic", 24, TRUE);
-
+ totem_grilo_setup_icons (self->priv->totem);
setup_browse (self, builder);
setup_menus (self, builder);
}
@@ -1455,10 +1318,6 @@ impl_activate (PeasActivatable *plugin)
TotemGriloPluginPrivate *priv = self->priv;
priv->totem = g_object_ref (g_object_get_data (G_OBJECT (plugin), "object"));
priv->main_window = totem_object_get_main_window (priv->totem);
- priv->cache_thumbnails = g_hash_table_new_full (g_str_hash,
- g_str_equal,
- g_free,
- g_object_unref);
builder = totem_plugin_load_interface ("grilo", "grilo.ui", TRUE, self->priv->main_window, self);
setup_ui (self, builder);
@@ -1474,7 +1333,6 @@ impl_deactivate (PeasActivatable *plugin)
GList *sources;
GList *s;
GrlRegistry *registry;
- guint i;
totem_object_remove_sidebar_page (self->priv->totem, "grilo-browse");
totem_object_remove_sidebar_page (self->priv->totem, "grilo-search");
@@ -1492,8 +1350,7 @@ impl_deactivate (PeasActivatable *plugin)
}
g_list_free (sources);
- for (i = 0; i < NUM_ICONS; i++)
- g_clear_object (&self->priv->icons[i]);
+ totem_grilo_clear_icons ();
/* Empty results */
gtk_tree_store_clear (GTK_TREE_STORE (self->priv->browser_model));
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
