2009-01-02 [colin] 3.7.0cvs11

	* src/stock_pixmap.c
	* src/stock_pixmap.h
		Remove now-unused stock_pixmap_gdk

diff --git a/ChangeLog b/ChangeLog
index 6caffae7402fa8c6d852e2a00ba4216521eb2d28..6cf812a4640e9db33d13c44318d87021c405e3d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-02 [colin]     3.7.0cvs11
+
+       * src/stock_pixmap.c
+       * src/stock_pixmap.h
+               Remove now-unused stock_pixmap_gdk
+

 2009-01-02 [colin]     3.7.0cvs10
 
        * src/gtk/gtkutils.c
 2009-01-02 [colin]     3.7.0cvs10
 
        * src/gtk/gtkutils.c

diff --git a/PATCHSETS b/PATCHSETS
index aeba51a90262c9a3d0594d953038931c4d5d56ff..afc468c7e7695e4bb49f18c66390c135cb7acdfa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -3672,3 +3672,4 @@
 ( cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/addressadd.c;  cvs diff -u -r 1.60.2.126 -r 1.60.2.127 src/addressbook.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/addressitem.h;  cvs diff -u -r 1.207.2.207 -r 1.207.2.208 src/folderview.c;  cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/grouplistdialog.c;  cvs diff -u -r 1.14.2.20 -r 1.14.2.21 src/importldif.c;  cvs diff -u -r 1.83.2.149 -r 1.83.2.150 src/mimeview.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/noticeview.c;  cvs diff -u -r 1.3.2.60 -r 1.3.2.61 src/prefs_themes.c;  cvs diff -u -r 1.395.2.402 -r 1.395.2.403 src/summaryview.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.4.52 -r 1.1.4.53 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/gtksctree.h;  cvs diff -u -r 1.14.2.66 -r 1.14.2.67 src/plugins/trayicon/trayicon.c;  ) > 3.7.0cvs8.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/uri_opener.c;  ) > 3.7.0cvs9.patchset
 ( cvs diff -u -r 1.5.2.85 -r 1.5.2.86 src/gtk/gtkutils.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/claws-mail_icon.xpm;  ) > 3.7.0cvs10.patchset
 ( cvs diff -u -r 1.9.2.26 -r 1.9.2.27 src/addressadd.c;  cvs diff -u -r 1.60.2.126 -r 1.60.2.127 src/addressbook.c;  cvs diff -u -r 1.1.2.14 -r 1.1.2.15 src/addressbook_foldersel.c;  cvs diff -u -r 1.5.2.12 -r 1.5.2.13 src/addressitem.h;  cvs diff -u -r 1.207.2.207 -r 1.207.2.208 src/folderview.c;  cvs diff -u -r 1.14.2.22 -r 1.14.2.23 src/grouplistdialog.c;  cvs diff -u -r 1.14.2.20 -r 1.14.2.21 src/importldif.c;  cvs diff -u -r 1.83.2.149 -r 1.83.2.150 src/mimeview.c;  cvs diff -u -r 1.5.2.21 -r 1.5.2.22 src/noticeview.c;  cvs diff -u -r 1.3.2.60 -r 1.3.2.61 src/prefs_themes.c;  cvs diff -u -r 1.395.2.402 -r 1.395.2.403 src/summaryview.c;  cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gtk/gtkcmclist.c;  cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/gtk/gtkcmclist.h;  cvs diff -u -r 1.1.2.9 -r 1.1.2.10 src/gtk/gtkcmctree.c;  cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/gtk/gtkcmctree.h;  cvs diff -u -r 1.1.4.52 -r 1.1.4.53 src/gtk/gtksctree.c;  cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/gtk/gtksctree.h;  cvs diff -u -r 1.14.2.66 -r 1.14.2.67 src/plugins/trayicon/trayicon.c;  ) > 3.7.0cvs8.patchset
 ( cvs diff -u -r 1.1.2.8 -r 1.1.2.9 src/uri_opener.c;  ) > 3.7.0cvs9.patchset
 ( cvs diff -u -r 1.5.2.85 -r 1.5.2.86 src/gtk/gtkutils.c;  cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/pixmaps/claws-mail_icon.xpm;  ) > 3.7.0cvs10.patchset

+( cvs diff -u -r 1.25.2.61 -r 1.25.2.62 src/stock_pixmap.c;  cvs diff -u -r 1.18.2.38 -r 1.18.2.39 src/stock_pixmap.h;  ) > 3.7.0cvs11.patchset

diff --git a/configure.ac b/configure.ac
index 0e2d0341e61ac1ebc98f750ccd1224486f2136ce..31e3bc597207df4b253b2ae59fa3d1ad45823ee4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=7
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=10
+EXTRA_VERSION=11

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 94bda0203c629d7894fe0353034eda393a08fc86..3640f615e1373f9b3d9a9e18e484422a07f11e70 100644 (file)
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -486,80 +486,6 @@ try_next_extension:
        return 0;
 }
 
        return 0;
 }
 

-/* create GdkPixmap if it has not created yet */
-gint stock_pixmap_gdk(GtkWidget *window, StockPixmap icon,
-                     GdkPixmap **pixmap, GdkBitmap **mask)
-{
-       StockPixmapData *pix_d;
-       static const char *extension[]={".png", ".xpm", NULL};
-       int i = 0;
-       gboolean theme_changed = FALSE;
-
-       if (pixmap) *pixmap = NULL;
-       if (mask)   *mask   = NULL;
-
-       g_return_val_if_fail(window != NULL, -1);
-       g_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, -1);
-
-       pix_d = &pixmaps[icon];
-
-       theme_changed = (strcmp2(pix_d->icon_path, prefs_common.pixmap_theme_path) != 0);
-       if (!pix_d->pixmap || theme_changed) {
-               GdkPixmap *pix = NULL;
-
-               if (theme_changed && pix_d->pixbuf) {
-                       g_object_unref(pix_d->pixbuf);
-                       pix_d->pixbuf = NULL;
-               }
-
-               if (strcmp(prefs_common.pixmap_theme_path, DEFAULT_PIXMAP_THEME) != 0) {
-                       if ( is_dir_exist(prefs_common.pixmap_theme_path) ) {
-                               char *icon_file_name; 
-try_next_extension:
-                               icon_file_name = g_strconcat(prefs_common.pixmap_theme_path,
-                                                            G_DIR_SEPARATOR_S,
-                                                            pix_d->file,
-                                                            extension[i],
-                                                            NULL);
-                               if (is_file_exist(icon_file_name))
-                                       PIXMAP_CREATE_FROM_FILE(window, pix, pix_d->mask, icon_file_name);
-                               if (pix) {
-                                       g_free(pix_d->icon_path);
-                                       pix_d->icon_path = g_strdup(prefs_common.pixmap_theme_path);
-                               }
-                               g_free(icon_file_name);
-                               if (!pix) {
-                                       i++;
-                                       if (extension[i])
-                                               goto try_next_extension;
-                               }
-                       } else {
-                               /* even the path does not exist (deleted between two sessions), so
-                               set the preferences to the internal theme */
-                               prefs_common.pixmap_theme_path = g_strdup(DEFAULT_PIXMAP_THEME);
-                       }
-               }
-               pix_d->pixmap = pix;
-       }
-
-       if (!pix_d->pixmap) {
-               PIXMAP_CREATE(window, pix_d->pixmap, pix_d->mask, pix_d->data);
-               if (pix_d->pixmap) {
-                       g_free(pix_d->icon_path);
-                       pix_d->icon_path = g_strdup(DEFAULT_PIXMAP_THEME);      
-               }
-       }
-
-       g_return_val_if_fail(pix_d->pixmap != NULL, -1);
-       
-       if (pixmap) 
-               *pixmap = pix_d->pixmap;
-       if (mask)   
-               *mask   = pix_d->mask;
-
-       return 0;
-}
-

 static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
 {
        struct dirent *d;
 static void stock_pixmap_find_themes_in_dir(GList **list, const gchar *dirname)
 {
        struct dirent *d;

diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index 028f8b09e551c7f0d424f0a6fc8c3d5109a028a6..b9f0a3f597aa58086d5165960e0de3cb784f552a 100644 (file)
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -205,10 +205,6 @@ GtkWidget *stock_pixmap_widget     (GtkWidget       *window,
                                 StockPixmap      icon);
 gint stock_pixbuf_gdk          (GtkWidget *window, StockPixmap icon, 
                                 GdkPixbuf **pixbuf);
                                 StockPixmap      icon);
 gint stock_pixbuf_gdk          (GtkWidget *window, StockPixmap icon, 
                                 GdkPixbuf **pixbuf);

-gint stock_pixmap_gdk          (GtkWidget       *window,
-                                StockPixmap      icon,
-                                GdkPixmap      **pixmap,
-                                GdkBitmap      **mask);

 
 GList *stock_pixmap_themes_list_new    (void);
 void stock_pixmap_themes_list_free     (GList *list);
 
 GList *stock_pixmap_themes_list_new    (void);
 void stock_pixmap_themes_list_free     (GList *list);