[Xfce4-commits] <thunar:master> Drop the attachpoints structure.

[Nick Schermer]

Updating branch refs/heads/master
         to 251775c5c8decbba27fc5587feac405c6dad4273 (commit)
       from 987202b718b167b84b564670b6f8867910860d50 (commit)

commit 251775c5c8decbba27fc5587feac405c6dad4273
Author: Nick Schermer <nick at xfce.org>
Date:   Tue Oct 30 21:29:51 2012 +0100

    Drop the attachpoints structure.

 thunar/thunar-icon-factory.c  |    4 +---
 thunar/thunar-icon-factory.h  |   18 ------------------
 thunar/thunar-icon-renderer.c |    2 +-
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/thunar/thunar-icon-factory.c b/thunar/thunar-icon-factory.c
index 12dd602..72cb529 100644
--- a/thunar/thunar-icon-factory.c
+++ b/thunar/thunar-icon-factory.c
@@ -685,7 +685,6 @@ thunar_icon_factory_get_for_icon_theme (GtkIconTheme *icon_theme)
  * @factory       : a #ThunarIconFactory instance.
  * @name          : name of the icon to load.
  * @size          : desired icon size.
- * @attach_points : location to store the attach points to or %NULL.
  * @wants_default : %TRUE to return the fallback icon if no icon of @name
  *                  is found in the @factory.
  *
@@ -703,7 +702,6 @@ GdkPixbuf*
 thunar_icon_factory_load_icon (ThunarIconFactory        *factory,
                                const gchar              *name,
                                gint                      size,
-                               ThunarEmblemAttachPoints *attach_points,
                                gboolean                  wants_default)
 {
   _thunar_return_val_if_fail (THUNAR_IS_ICON_FACTORY (factory), NULL);
@@ -847,7 +845,7 @@ thunar_icon_factory_load_file_icon (ThunarIconFactory  *factory,
   if (G_LIKELY (icon == NULL))
     {
       icon_name = thunar_file_get_icon_name (file, icon_state, factory->icon_theme);
-      icon = thunar_icon_factory_load_icon (factory, icon_name, icon_size, NULL, TRUE);
+      icon = thunar_icon_factory_load_icon (factory, icon_name, icon_size, TRUE);
       g_free (icon_name);
     }
 
diff --git a/thunar/thunar-icon-factory.h b/thunar/thunar-icon-factory.h
index 61d0de7..fde1d09 100644
--- a/thunar/thunar-icon-factory.h
+++ b/thunar/thunar-icon-factory.h
@@ -41,23 +41,6 @@ typedef struct _ThunarIconFactory      ThunarIconFactory;
  **/
 #define THUNAR_THUMBNAIL_SIZE (128)
 
-/**
- * THUNAR_EMBLEM_MAX_ATTACH_POINTS:
- * The maximum number of attach points for icons managed
- * by the #ThunarIconFactory.
- **/
-#define THUNAR_EMBLEM_MAX_ATTACH_POINTS (12)
-
-/**
- * ThunarEmblemAttachPoints:
- * Holds the emblem attach points for a given icon.
- */
-typedef struct
-{
-	gint     num_points;
-	GdkPoint points[THUNAR_EMBLEM_MAX_ATTACH_POINTS];
-} ThunarEmblemAttachPoints;
-
 GType                  thunar_icon_factory_get_type           (void) G_GNUC_CONST;
 
 ThunarIconFactory     *thunar_icon_factory_get_default        (void);
@@ -66,7 +49,6 @@ ThunarIconFactory     *thunar_icon_factory_get_for_icon_theme (GtkIconTheme
 GdkPixbuf             *thunar_icon_factory_load_icon          (ThunarIconFactory        *factory,
                                                                const gchar              *name,
                                                                gint                      size,
-                                                               ThunarEmblemAttachPoints *attach_points,
                                                                gboolean                  wants_default);
 
 GdkPixbuf             *thunar_icon_factory_load_file_icon     (ThunarIconFactory        *factory,
diff --git a/thunar/thunar-icon-renderer.c b/thunar/thunar-icon-renderer.c
index a63a99b..8fb08a7 100644
--- a/thunar/thunar-icon-renderer.c
+++ b/thunar/thunar-icon-renderer.c
@@ -465,7 +465,7 @@ thunar_icon_renderer_render (GtkCellRenderer     *renderer,
           for (lp = emblems, position = 0; lp != NULL && position < max_emblems; lp = lp->next)
             {
               /* check if we have the emblem in the icon theme */
-              emblem = thunar_icon_factory_load_icon (icon_factory, lp->data, icon_renderer->size, NULL, FALSE);
+              emblem = thunar_icon_factory_load_icon (icon_factory, lp->data, icon_renderer->size, FALSE);
               if (G_UNLIKELY (emblem == NULL))
                 continue;