+2008-01-12 [colin] 3.2.0cvs38
+
+ * src/Makefile.am
+ * src/stock_pixmap.c
+ * src/stock_pixmap.h
+ * src/pixmaps/tray_newmail.offline.xpm
+ * src/pixmaps/tray_newmail.xpm
+ * src/pixmaps/tray_newmarkedmail.offline.xpm
+ * src/pixmaps/tray_newmarkedmail.xpm
+ * src/pixmaps/tray_nomail.offline.xpm
+ * src/pixmaps/tray_nomail.xpm
+ * src/pixmaps/tray_unreadmail.offline.xpm
+ * src/pixmaps/tray_unreadmail.xpm
+ * src/pixmaps/tray_unreadmarkedmail.offline.xpm
+ * src/pixmaps/tray_unreadmarkedmail.xpm
+ * src/plugins/trayicon/Makefile.am
+ * src/plugins/trayicon/newmail.offline.xpm
+ * src/plugins/trayicon/newmail.xpm
+ * src/plugins/trayicon/newmarkedmail.offline.xpm
+ * src/plugins/trayicon/newmarkedmail.xpm
+ * src/plugins/trayicon/nomail.offline.xpm
+ * src/plugins/trayicon/nomail.xpm
+ * src/plugins/trayicon/trayicon.c
+ * src/plugins/trayicon/unreadmail.offline.xpm
+ * src/plugins/trayicon/unreadmail.xpm
+ * src/plugins/trayicon/unreadmarkedmail.offline.xpm
+ * src/plugins/trayicon/unreadmarkedmail.xpm
+ Make the Trayicon plugin icons themable
+
2008-01-12 [wwp] 3.2.0cvs37
* src/prefs_display_header.c
( cvs diff -u -r 1.12.2.49 -r 1.12.2.50 src/action.c; cvs diff -u -r 1.8.2.29 -r 1.8.2.30 src/editldap.c; cvs diff -u -r 1.105.2.122 -r 1.105.2.123 src/prefs_account.c; cvs diff -u -r 1.1.2.67 -r 1.1.2.68 src/wizard.c; cvs diff -u -r 1.2.2.26 -r 1.2.2.27 src/gtk/inputdialog.c; cvs diff -u -r 1.1.2.28 -r 1.1.2.29 src/plugins/pgpcore/passphrase.c; ) > 3.2.0cvs35.patchset
( cvs diff -u -r 1.179.2.206 -r 1.179.2.207 src/imap.c; cvs diff -u -r 1.94.2.167 -r 1.94.2.168 src/messageview.c; cvs diff -u -r 1.204.2.160 -r 1.204.2.161 src/prefs_common.c; ) > 3.2.0cvs36.patchset
( cvs diff -u -r 1.16.2.33 -r 1.16.2.34 src/prefs_display_header.c; ) > 3.2.0cvs37.patchset
+( cvs diff -u -r 1.155.2.81 -r 1.155.2.82 src/Makefile.am; cvs diff -u -r 1.25.2.50 -r 1.25.2.51 src/stock_pixmap.c; cvs diff -u -r 1.18.2.32 -r 1.18.2.33 src/stock_pixmap.h; diff -u /dev/null src/pixmaps/tray_newmail.offline.xpm; diff -u /dev/null src/pixmaps/tray_newmail.xpm; diff -u /dev/null src/pixmaps/tray_newmarkedmail.offline.xpm; diff -u /dev/null src/pixmaps/tray_newmarkedmail.xpm; diff -u /dev/null src/pixmaps/tray_nomail.offline.xpm; diff -u /dev/null src/pixmaps/tray_nomail.xpm; diff -u /dev/null src/pixmaps/tray_unreadmail.offline.xpm; diff -u /dev/null src/pixmaps/tray_unreadmail.xpm; diff -u /dev/null src/pixmaps/tray_unreadmarkedmail.offline.xpm; diff -u /dev/null src/pixmaps/tray_unreadmarkedmail.xpm; cvs diff -u -r 1.4.2.10 -r 1.4.2.11 src/plugins/trayicon/Makefile.am; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/trayicon/newmail.offline.xpm; cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/newmail.xpm; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/trayicon/newmarkedmail.offline.xpm; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/trayicon/newmarkedmail.xpm; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/trayicon/nomail.offline.xpm; cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/nomail.xpm; cvs diff -u -r 1.14.2.59 -r 1.14.2.60 src/plugins/trayicon/trayicon.c; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/trayicon/unreadmail.offline.xpm; cvs diff -u -r -1.1 -r -1.2 src/plugins/trayicon/unreadmail.xpm; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/trayicon/unreadmarkedmail.offline.xpm; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 src/plugins/trayicon/unreadmarkedmail.xpm; ) > 3.2.0cvs38.patchset
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=37
+EXTRA_VERSION=38
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
pixmaps/moved.xpm \
pixmaps/copied.xpm \
pixmaps/watchthread.xpm \
+ pixmaps/tray_newmail.offline.xpm \
+ pixmaps/tray_newmail.xpm \
+ pixmaps/tray_newmarkedmail.offline.xpm \
+ pixmaps/tray_newmarkedmail.xpm \
+ pixmaps/tray_nomail.offline.xpm \
+ pixmaps/tray_nomail.xpm \
+ pixmaps/tray_unreadmail.offline.xpm \
+ pixmaps/tray_unreadmail.xpm \
+ pixmaps/tray_unreadmarkedmail.offline.xpm \
+ pixmaps/tray_unreadmarkedmail.xpm \
pixmaps/empty.xpm
/* XPM */
-static char * newmail_offline_xpm[] = {
+static char * tray_newmail_offline_xpm[] = {
"16 16 10 1",
" c None",
". c #787878",
/* XPM */
-static char * newmail_xpm[] = {
+static char * tray_newmail_xpm[] = {
"16 16 8 1",
" c None",
". c #000000",
/* XPM */
-static char * newmarkedmail_offline_xpm[] = {
+static char * tray_newmarkedmail_offline_xpm[] = {
"16 16 11 1",
" c None",
". c #EE9595",
/* XPM */
-static char * newmarkedmail_xpm[] = {
+static char * tray_newmarkedmail_xpm[] = {
"16 16 9 1",
" c None",
". c #DE3636",
/* XPM */
-static char * nomail_offline_xpm[] = {
+static char * tray_nomail_offline_xpm[] = {
"16 16 10 1",
" c None",
". c #787878",
/* XPM */
-static char * nomail_xpm[] = {
+static char * tray_nomail_xpm[] = {
"16 16 8 1",
" c None",
". c #000000",
/* XPM */
-static char * unreadmail_offline_xpm[] = {
+static char * tray_unreadmail_offline_xpm[] = {
"16 16 10 1",
" c None",
". c #787878",
/* XPM */
-static char * unreadmail_xpm[] = {
+static char * tray_unreadmail_xpm[] = {
"16 16 8 1",
" c None",
". c #000000",
/* XPM */
-static char * unreadmarkedmail_offline_xpm[] = {
+static char * tray_unreadmarkedmail_offline_xpm[] = {
"16 16 10 1",
" c None",
". c #EE9595",
/* XPM */
-static char * unreadmarkedmail_xpm[] = {
+static char * tray_unreadmarkedmail_xpm[] = {
"16 16 8 1",
" c None",
". c #DE3636",
$(MAEMO_CFLAGS)
EXTRA_DIST = \
- README \
- newmail.xpm \
- newmarkedmail.xpm \
- nomail.xpm \
- unreadmail.xpm \
- unreadmarkedmail.xpm \
- newmail.offline.xpm \
- newmarkedmail.offline.xpm \
- nomail.offline.xpm \
- unreadmail.offline.xpm \
- unreadmarkedmail.offline.xpm
+ README
#include "trayicon_prefs.h"
-#include "newmarkedmail.xpm"
-#include "unreadmarkedmail.xpm"
-#include "newmail.xpm"
-#include "unreadmail.xpm"
-#include "nomail.xpm"
-#include "newmarkedmail.offline.xpm"
-#include "unreadmarkedmail.offline.xpm"
-#include "newmail.offline.xpm"
-#include "unreadmail.offline.xpm"
-#include "nomail.offline.xpm"
+#include "stock_pixmap.h"
#define PLUGIN_NAME (_("Trayicon"))
gtk_window_set_default_size(GTK_WINDOW(trayicon), 16, 16);
gtk_container_set_border_width(GTK_CONTAINER(trayicon), 0);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap[0], nomail_bitmap[0], nomail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap[0], unreadmail_bitmap[0], unreadmail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap[0], newmail_bitmap[0], newmail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmarkedmail_pixmap[0], unreadmarkedmail_bitmap[0], unreadmarkedmail_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmarkedmail_pixmap[0], newmarkedmail_bitmap[0], newmarkedmail_xpm);
-
- PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap[1], nomail_bitmap[1], nomail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap[1], unreadmail_bitmap[1], unreadmail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap[1], newmail_bitmap[1], newmail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmarkedmail_pixmap[1], unreadmarkedmail_bitmap[1], unreadmarkedmail_offline_xpm);
- PIXMAP_CREATE(GTK_WIDGET(trayicon), newmarkedmail_pixmap[1], newmarkedmail_bitmap[1], newmarkedmail_offline_xpm);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_NOMAIL, &nomail_pixmap[0], &nomail_bitmap[0]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_UNREADMAIL, &unreadmail_pixmap[0], &unreadmail_bitmap[0]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_NEWMAIL, &newmail_pixmap[0], &newmail_bitmap[0]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL, &unreadmarkedmail_pixmap[0], &unreadmarkedmail_bitmap[0]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_NEWMARKEDMAIL, &newmarkedmail_pixmap[0], &newmarkedmail_bitmap[0]);
+
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_NOMAIL_OFFLINE, &nomail_pixmap[1], &nomail_bitmap[1]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_UNREADMAIL_OFFLINE, &unreadmail_pixmap[1], &unreadmail_bitmap[1]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_NEWMAIL_OFFLINE, &newmail_pixmap[1], &newmail_bitmap[1]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL_OFFLINE, &unreadmarkedmail_pixmap[1], &unreadmarkedmail_bitmap[1]);
+ stock_pixmap_gdk(GTK_WIDGET(trayicon), STOCK_PIXMAP_TRAY_NEWMARKEDMAIL_OFFLINE, &newmarkedmail_pixmap[1], &newmarkedmail_bitmap[1]);
eventbox = gtk_event_box_new();
#include "pixmaps/selection.xpm"
#include "pixmaps/watchthread.xpm"
#include "pixmaps/empty.xpm"
+#include "pixmaps/tray_newmail.offline.xpm"
+#include "pixmaps/tray_newmail.xpm"
+#include "pixmaps/tray_newmarkedmail.offline.xpm"
+#include "pixmaps/tray_newmarkedmail.xpm"
+#include "pixmaps/tray_nomail.offline.xpm"
+#include "pixmaps/tray_nomail.xpm"
+#include "pixmaps/tray_unreadmail.offline.xpm"
+#include "pixmaps/tray_unreadmail.xpm"
+#include "pixmaps/tray_unreadmarkedmail.offline.xpm"
+#include "pixmaps/tray_unreadmarkedmail.xpm"
typedef struct _StockPixmapData StockPixmapData;
{copied_xpm , NULL, NULL, "copied", NULL},
{selection_xpm , NULL, NULL, "selection", NULL},
{watchthread_xpm , NULL, NULL, "watchthread", NULL},
+ {tray_newmail_offline_xpm , NULL, NULL, "tray_newmail_offline", NULL},
+ {tray_newmail_xpm , NULL, NULL, "tray_newmail", NULL},
+ {tray_newmarkedmail_offline_xpm , NULL, NULL, "tray_newmarkedmail_offline", NULL},
+ {tray_newmarkedmail_xpm , NULL, NULL, "tray_newmarkedmail", NULL},
+ {tray_nomail_offline_xpm , NULL, NULL, "tray_nomail_offline", NULL},
+ {tray_nomail_xpm , NULL, NULL, "tray_nomail", NULL},
+ {tray_unreadmail_offline_xpm , NULL, NULL, "tray_unreadmail_offline", NULL},
+ {tray_unreadmail_xpm , NULL, NULL, "tray_unreadmail", NULL},
+ {tray_unreadmarkedmail_offline_xpm , NULL, NULL, "tray_unreadmarkedmail_offline", NULL},
+ {tray_unreadmarkedmail_xpm , NULL, NULL, "tray_unreadmarkedmail", NULL},
{empty_xpm , NULL, NULL, "empty" , NULL}
};
STOCK_PIXMAP_COPIED,
STOCK_PIXMAP_SELECTION,
STOCK_PIXMAP_WATCHTHREAD,
+ STOCK_PIXMAP_TRAY_NEWMAIL_OFFLINE,
+ STOCK_PIXMAP_TRAY_NEWMAIL,
+ STOCK_PIXMAP_TRAY_NEWMARKEDMAIL_OFFLINE,
+ STOCK_PIXMAP_TRAY_NEWMARKEDMAIL,
+ STOCK_PIXMAP_TRAY_NOMAIL_OFFLINE,
+ STOCK_PIXMAP_TRAY_NOMAIL,
+ STOCK_PIXMAP_TRAY_UNREADMAIL_OFFLINE,
+ STOCK_PIXMAP_TRAY_UNREADMAIL,
+ STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL_OFFLINE,
+ STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL,
STOCK_PIXMAP_EMPTY, /* last entry */
N_STOCK_PIXMAPS
} StockPixmap;