[Xfce4-commits] <terminal:master> Small code cleanup.

[Nick Schermer]

Updating branch refs/heads/master
         to dbb9a74b67958c988bbca3f16d6ee26143853863 (commit)
       from 6ea69aa077ed4580f9c4d77fdc6a8e5e82cde27f (commit)

commit dbb9a74b67958c988bbca3f16d6ee26143853863
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Aug 11 13:37:28 2010 +0200

    Small code cleanup.

 terminal/terminal-image-loader.c |   36 +++++++++++++++++++++++++++---------
 terminal/terminal-image-loader.h |   20 --------------------
 terminal/terminal-screen.c       |    1 -
 3 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/terminal/terminal-image-loader.c b/terminal/terminal-image-loader.c
index 3338fe4..f01d8c8 100644
--- a/terminal/terminal-image-loader.c
+++ b/terminal/terminal-image-loader.c
@@ -52,6 +52,27 @@ static void       terminal_image_loader_saturate          (TerminalImageLoader
                                                            GdkPixbuf                *pixbuf);
 
 
+struct _TerminalImageLoaderClass
+{
+  GObjectClass  __parent__;
+};
+
+struct _TerminalImageLoader
+{
+  GObject                  __parent__;
+  TerminalPreferences     *preferences;
+
+  /* the cached image data */
+  gchar                   *path;
+  GSList                  *cache;
+  GSList                  *cache_invalid;
+  gdouble                  darkness;
+  GdkColor                 bgcolor;
+  GdkPixbuf               *pixbuf;
+  TerminalBackgroundStyle  style;
+};
+
+
 
 G_DEFINE_TYPE (TerminalImageLoader, terminal_image_loader, G_TYPE_OBJECT)
 
@@ -116,8 +137,7 @@ terminal_image_loader_check (TerminalImageLoader *loader)
 
   if (!exo_str_is_equal (selected_path, loader->path))
     {
-      if (G_LIKELY (loader->path != NULL))
-        g_free (loader->path);
+      g_free (loader->path);
       loader->path = g_strdup (selected_path);
 
       if (GDK_IS_PIXBUF (loader->pixbuf))
@@ -478,15 +498,13 @@ terminal_image_loader_load (TerminalImageLoader *loader,
       if (gdk_pixbuf_get_height (pixbuf) == height
           && gdk_pixbuf_get_width (pixbuf) == width)
         {
-          g_object_ref (G_OBJECT (pixbuf));
-          return pixbuf;
+          return g_object_ref (G_OBJECT (pixbuf));
         }
       else if (gdk_pixbuf_get_height (pixbuf) >= height
             && gdk_pixbuf_get_width (pixbuf) >= width
             && loader->style == TERMINAL_BACKGROUND_STYLE_TILED)
         {
-          g_object_ref (G_OBJECT (pixbuf));
-          return pixbuf;
+          return g_object_ref (G_OBJECT (pixbuf));
         }
     }
 
@@ -519,9 +537,9 @@ terminal_image_loader_load (TerminalImageLoader *loader,
 
   terminal_image_loader_saturate (loader, pixbuf);
 
-  loader->cache = g_slist_append (loader->cache, pixbuf);
-  g_object_weak_ref (G_OBJECT (pixbuf), terminal_image_loader_pixbuf_destroyed, loader);
-  g_object_ref (G_OBJECT (loader));
+  loader->cache = g_slist_prepend (loader->cache, pixbuf);
+  g_object_weak_ref (G_OBJECT (pixbuf), terminal_image_loader_pixbuf_destroyed,
+                     g_object_ref (G_OBJECT (loader)));
 
   return pixbuf;
 }
diff --git a/terminal/terminal-image-loader.h b/terminal/terminal-image-loader.h
index 1074f1b..75b77dd 100644
--- a/terminal/terminal-image-loader.h
+++ b/terminal/terminal-image-loader.h
@@ -35,26 +35,6 @@ G_BEGIN_DECLS
 typedef struct _TerminalImageLoaderClass TerminalImageLoaderClass;
 typedef struct _TerminalImageLoader      TerminalImageLoader;
 
-struct _TerminalImageLoaderClass
-{
-  GObjectClass  __parent__;
-};
-
-struct _TerminalImageLoader
-{
-  GObject                  __parent__;
-  TerminalPreferences     *preferences;
-
-  /* the cached image data */
-  gchar                   *path;
-  GSList                  *cache;
-  GSList                  *cache_invalid;
-  gdouble                  darkness;
-  GdkColor                 bgcolor;
-  GdkPixbuf               *pixbuf;
-  TerminalBackgroundStyle  style;
-};
-
 GType                terminal_image_loader_get_type   (void) G_GNUC_CONST;
 
 TerminalImageLoader *terminal_image_loader_get        (void);
diff --git a/terminal/terminal-screen.c b/terminal/terminal-screen.c
index 9ba86fb..ba9ce1e 100644
--- a/terminal/terminal-screen.c
+++ b/terminal/terminal-screen.c
@@ -1219,7 +1219,6 @@ terminal_screen_timer_background (gpointer user_data)
                                           screen->terminal->allocation.width,
                                           screen->terminal->allocation.height);
       vte_terminal_set_background_image (VTE_TERMINAL (screen->terminal), image);
-
       if (G_LIKELY (image != NULL))
         g_object_unref (G_OBJECT (image));
       g_object_unref (G_OBJECT (loader));