2006-08-25 [paul] 2.4.0cvs90

[claws.git] / src / stock_pixmap.c

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 95d187ebf2049bf1d760db0f1fe03cead7d69436..fbe04d90b855dc5764aee787070bf4b9e41b688b 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -1,6 +1,6 @@
 /*
  * Sylpheed -- a GTK+ based, lightweight, and fast e-mail client
- * Copyright (C) 1999-2001 Hiroyuki Yamamoto
+ * Copyright (C) 1999-2006 Hiroyuki Yamamoto and the Sylpheed-Claws team
  *
  * 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
@@ -14,7 +14,7 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
  */
 
 #include "defs.h"
@@ -71,8 +71,8 @@
 #include "pixmaps/paste.xpm"
 #include "pixmaps/preferences.xpm"
 #include "pixmaps/properties.xpm"
-#include "pixmaps/sylpheed_icon.xpm"
-#include "pixmaps/sylpheed_logo.xpm"
+#include "pixmaps/sylpheed-claws_icon.xpm"
+#include "pixmaps/sylpheed-claws_logo.xpm"
 #include "pixmaps/address_book.xpm"
 #include "pixmaps/unread.xpm"
 #include "pixmaps/read.xpm"
@@ -116,6 +116,7 @@
 #include "pixmaps/outbox.xpm"
 #include "pixmaps/outbox_hrm.xpm"
 #include "pixmaps/trash.xpm"
+#include "pixmaps/trash_btn.xpm"
 #include "pixmaps/trash_hrm.xpm"
 #include "pixmaps/drafts_close.xpm"
 #include "pixmaps/drafts_open.xpm"
@@ -131,6 +132,12 @@
 #include "pixmaps/drafts_close_mark.xpm"
 #include "pixmaps/drafts_open_mark.xpm"
 #include "pixmaps/dir_noselect.xpm"
+#include "pixmaps/spam.xpm"
+#include "pixmaps/spam_btn.xpm"
+#include "pixmaps/ham_btn.xpm"
+#include "pixmaps/moved.xpm"
+#include "pixmaps/copied.xpm"
+#include "pixmaps/empty.xpm"
 
 typedef struct _StockPixmapData        StockPixmapData;
 
@@ -287,10 +294,17 @@ static StockPixmapData pixmaps[] =
        {privacy_emblem_failed_xpm              , NULL, NULL, "privacy_emblem_failed", NULL},   
        {privacy_emblem_warn_xpm                , NULL, NULL, "privacy_emblem_warn", NULL},
        {mime_message_xpm                       , NULL, NULL, "mime_message", NULL},
-       {sylpheed_icon_xpm                      , NULL, NULL, "sylpheed_icon", NULL},
+       {sylpheed_claws_icon_xpm                , NULL, NULL, "sylpheed_claws_icon", NULL},
        {read_xpm                               , NULL, NULL, "read", NULL},
-       {sylpheed_logo_xpm                      , NULL, NULL, "sylpheed_logo", NULL},
-        {dir_noselect_xpm                       , NULL, NULL, "dir_noselect" , NULL}
+       {trash_btn_xpm                          , NULL, NULL, "trash_btn", NULL},
+       {sylpheed_claws_logo_xpm                , NULL, NULL, "sylpheed_claws_logo", NULL},
+        {dir_noselect_xpm                       , NULL, NULL, "dir_noselect" , NULL},
+        {spam_xpm                               , NULL, NULL, "spam" , NULL},
+        {spam_btn_xpm                           , NULL, NULL, "spam_btn" , NULL},
+        {ham_btn_xpm                            , NULL, NULL, "ham_btn" , NULL},
+       {moved_xpm                              , NULL, NULL, "moved", NULL},
+       {copied_xpm                             , NULL, NULL, "copied", NULL},
+        {empty_xpm                              , NULL, NULL, "empty" , NULL}
 };
 
 /* return newly constructed GtkPixmap from GdkPixmap */
@@ -340,7 +354,7 @@ gint stock_pixbuf_gdk(GtkWidget *window, StockPixmap icon, GdkPixbuf **pixbuf)
                                        if (err) g_error_free(err);
                                }                                       
                                if (pix) {
-                                       if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+                                       g_free(pix_d->icon_path);
                                        pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
                                }
                                g_free(icon_file_name);
@@ -356,7 +370,7 @@ gint stock_pixbuf_gdk(GtkWidget *window, StockPixmap icon, GdkPixbuf **pixbuf)
        if (!pix_d->pixbuf) {
                pix_d->pixbuf = gdk_pixbuf_new_from_xpm_data((const gchar **) pix_d->data);
                if (pix_d->pixbuf) {
-                       if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+                       g_free(pix_d->icon_path);
                        pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);      
                }
        }
@@ -400,7 +414,7 @@ gint stock_pixmap_gdk(GtkWidget *window, StockPixmap icon,
                                if (is_file_exist(icon_file_name))
                                        PIXMAP_CREATE_FROM_FILE(window, pix, pix_d->mask, icon_file_name);
                                if (pix) {
-                                       if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+                                       g_free(pix_d->icon_path);
                                        pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
                                }
                                g_free(icon_file_name);
@@ -416,7 +430,7 @@ gint stock_pixmap_gdk(GtkWidget *window, StockPixmap icon,
        if (!pix_d->pixmap) {
                PIXMAP_CREATE(window, pix_d->pixmap, pix_d->mask, pix_d->data);
                if (pix_d->pixmap) {
-                       if (pix_d->icon_path != NULL) g_free(pix_d->icon_path);
+                       g_free(pix_d->icon_path);
                        pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);      
                }
        }
@@ -456,10 +470,11 @@ static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
                                filetoexist = g_strconcat(fullentry, G_DIR_SEPARATOR_S, pixmaps[i].file, ".xpm", NULL);
                                if (is_file_exist(filetoexist)) {
                                        *list = g_list_append(*list, fullentry);
+                                       g_free(filetoexist);
                                        break;
                                }
+                               g_free(filetoexist);
                        }
-                       g_free(filetoexist);
                        if (i == N_STOCK_PIXMAPS) 
                                g_free(fullentry);
                } else 
@@ -497,8 +512,7 @@ void stock_pixmap_themes_list_free(GList *list)
        GList *ptr;
 
        for (ptr = g_list_first(list); ptr != NULL; ptr = g_list_next(ptr)) 
-               if (ptr->data)
-                       g_free(ptr->data);
+               g_free(ptr->data);
        g_list_free(list);              
 }
 
@@ -604,7 +618,7 @@ static gboolean pixmap_with_overlay_expose_event_cb(GtkWidget *widget, GdkEventE
                gdk_draw_rectangle(drawable, gc_pix, TRUE, left, top, 
                                   data->overlay_width, data->overlay_height);
        }
-       gdk_gc_destroy(gc_pix);
+       g_object_unref(gc_pix);
        
        return TRUE;
 }