2004-11-24 [colin] 0.9.12cvs169.1

	* src/plugins/pgpmime/plugin.c
	* src/plugins/trayicon/Makefile.am
	* src/plugins/trayicon/newmarkedmail.xpm
	* src/plugins/trayicon/trayicon.c
	* src/plugins/trayicon/unreadmarkedmail.xpm
		Sync with HEAD

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index f11a331bdffc3ca969309a381dbbbb1250707321..5df3ce5a93f143e9393ce386ece87a3f921e11e0 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2004-11-24 [colin]     0.9.12cvs169.1
+
+       * src/plugins/pgpmime/plugin.c
+       * src/plugins/trayicon/Makefile.am
+       * src/plugins/trayicon/newmarkedmail.xpm
+       * src/plugins/trayicon/trayicon.c
+       * src/plugins/trayicon/unreadmarkedmail.xpm
+               Sync with HEAD
+

 2004-11-23 [colin]     0.9.12cvs168.1
 
        * src/partial_download.c
 2004-11-23 [colin]     0.9.12cvs168.1
 
        * src/partial_download.c

diff --git a/PATCHSETS b/PATCHSETS
index 4ac680a756652bbb4281579d880ba07f1c3787db..a91905acb5abf267976ed6065d245e91f674a00e 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -259,3 +259,4 @@
 ( cvs diff -u -r 1.115.2.23 -r 1.115.2.24 src/main.c; ) > 0.9.12cvs163.1.patchset
 ( cvs diff -u -r 1.155.2.13 -r 1.155.2.14 src/Makefile.am; cvs diff -u -r 1.65.2.19 -r 1.65.2.20 src/codeconv.c; cvs diff -u -r 1.382.2.74 -r 1.382.2.75 src/compose.c; cvs diff -u -r 1.207.2.21 -r 1.207.2.22 src/folderview.c; cvs diff -u -r 1.115.2.24 -r 1.115.2.25 src/main.c; cvs diff -u -r 0 -r 1 src/partial_download.c; cvs diff -u -r 0 -r 1 src/partial_download.h; cvs diff -u -r 1.105.2.13 -r 1.105.2.14 src/prefs_account.c; cvs diff -u -r 1.49.2.8 -r 1.49.2.9 src/prefs_account.h; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/privacy.c; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 src/privacy.h; cvs diff -u -r 1.49.2.22 -r 1.49.2.23 src/procmime.c; cvs diff -u -r 1.24.2.4 -r 1.24.2.5 src/common/Makefile.am; cvs diff -u -r 1.1 -r 1.2 src/common/base64.h; cvs diff -u -r -1.1.2.5 -r -1.1.2.6 src/common/partial_download.c; cvs diff -u -r -1.1.2.2 -r -1.1.2.3 src/common/partial_download.h; cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/gtk/prefswindow.h; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/prefs_gpg.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/sgpgme.h; ) > 0.9.12cvs166.1.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/partial_download.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/partial_download.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs168.1.patchset
 ( cvs diff -u -r 1.115.2.23 -r 1.115.2.24 src/main.c; ) > 0.9.12cvs163.1.patchset
 ( cvs diff -u -r 1.155.2.13 -r 1.155.2.14 src/Makefile.am; cvs diff -u -r 1.65.2.19 -r 1.65.2.20 src/codeconv.c; cvs diff -u -r 1.382.2.74 -r 1.382.2.75 src/compose.c; cvs diff -u -r 1.207.2.21 -r 1.207.2.22 src/folderview.c; cvs diff -u -r 1.115.2.24 -r 1.115.2.25 src/main.c; cvs diff -u -r 0 -r 1 src/partial_download.c; cvs diff -u -r 0 -r 1 src/partial_download.h; cvs diff -u -r 1.105.2.13 -r 1.105.2.14 src/prefs_account.c; cvs diff -u -r 1.49.2.8 -r 1.49.2.9 src/prefs_account.h; cvs diff -u -r 1.10.2.3 -r 1.10.2.4 src/privacy.c; cvs diff -u -r 1.10.2.2 -r 1.10.2.3 src/privacy.h; cvs diff -u -r 1.49.2.22 -r 1.49.2.23 src/procmime.c; cvs diff -u -r 1.24.2.4 -r 1.24.2.5 src/common/Makefile.am; cvs diff -u -r 1.1 -r 1.2 src/common/base64.h; cvs diff -u -r -1.1.2.5 -r -1.1.2.6 src/common/partial_download.c; cvs diff -u -r -1.1.2.2 -r -1.1.2.3 src/common/partial_download.h; cvs diff -u -r 1.12.2.7 -r 1.12.2.8 src/gtk/prefswindow.c; cvs diff -u -r 1.7.2.1 -r 1.7.2.2 src/gtk/prefswindow.h; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/plugins/pgpmime/pgpmime.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/prefs_gpg.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/plugins/pgpmime/prefs_gpg.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/sgpgme.c; cvs diff -u -r 1.1.2.3 -r 1.1.2.4 src/plugins/pgpmime/sgpgme.h; ) > 0.9.12cvs166.1.patchset
 ( cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/partial_download.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/partial_download.h; cvs diff -u -r 1.1.2.5 -r 1.1.2.6 src/plugins/pgpmime/plugin.c; ) > 0.9.12cvs168.1.patchset

+( cvs diff -u -r 1.1.2.6 -r 1.1.2.7 src/plugins/pgpmime/plugin.c; cvs diff -u -r 1.4.2.1 -r 1.4.2.2 src/plugins/trayicon/Makefile.am; cvs diff -u -r 0 -r 1 src/plugins/trayicon/newmarkedmail.xpm; cvs diff -u -r 1.14.2.12 -r 1.14.2.13 src/plugins/trayicon/trayicon.c; cvs diff -u -r 0 -r 1 src/plugins/trayicon/unreadmarkedmail.xpm; ) > 0.9.12cvs169.1.patchset

diff --git a/configure.ac b/configure.ac
index 8ff94a83a6f894327e8b068640d709bda53531c5..9a0a3f717cd0d0e21637b42125894373db60b2c3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=168
+EXTRA_VERSION=169

 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=.1
 

diff --git a/src/plugins/pgpmime/plugin.c b/src/plugins/pgpmime/plugin.c
index 16416d5e5e57efcc453a3b70e6be763c378a9c39..cf437d492fa95c1ca1ac5cacd2fec421f92e8082 100644 (file)
--- a/src/plugins/pgpmime/plugin.c
+++ b/src/plugins/pgpmime/plugin.c
@@ -38,7 +38,7 @@ gint plugin_init(gchar **error)
                return -1;
        }
 
                return -1;
        }
 

-       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 12, 34))) {
+       if ((sylpheed_get_version() < MAKE_NUMERIC_VERSION(0, 9, 12, 164))) {

                *error = g_strdup("Your sylpheed version is too old");
                return -1;
        }
                *error = g_strdup("Your sylpheed version is too old");
                return -1;
        }

diff --git a/src/plugins/trayicon/Makefile.am b/src/plugins/trayicon/Makefile.am
index 0f01034a894ca17d5b3fc26f7ab1ee2f2689e7c0..a01569d46fc3b1f6d714872803336a8d46049c42 100644 (file)
--- a/src/plugins/trayicon/Makefile.am
+++ b/src/plugins/trayicon/Makefile.am
@@ -29,5 +29,7 @@ AM_CPPFLAGS = \
 EXTRA_DIST = \
        README \
        newmail.xpm \
 EXTRA_DIST = \
        README \
        newmail.xpm \

+       newmarkedmail.xpm \

        nomail.xpm \
        nomail.xpm \

-       unreadmail.xpm
+       unreadmail.xpm \
+       unreadmarkedmail.xpm

diff --git a/src/plugins/trayicon/trayicon.c b/src/plugins/trayicon/trayicon.c
index eadeed90ddc4aa913fc137a8c39353ffda12d97c..ceed01b20e34d88e10697557279ccc89d37916fb 100644 (file)
--- a/src/plugins/trayicon/trayicon.c
+++ b/src/plugins/trayicon/trayicon.c
@@ -43,6 +43,8 @@
 #include "gtk/manage_window.h"
 
 #include "eggtrayicon.h"
 #include "gtk/manage_window.h"
 
 #include "eggtrayicon.h"

+#include "newmarkedmail.xpm"
+#include "unreadmarkedmail.xpm"

 #include "newmail.xpm"
 #include "unreadmail.xpm"
 #include "nomail.xpm"
 #include "newmail.xpm"
 #include "unreadmail.xpm"
 #include "nomail.xpm"


@@ -53,6 +55,10 @@ static GdkPixmap *newmail_pixmap;
 static GdkPixmap *newmail_bitmap;
 static GdkPixmap *unreadmail_pixmap;
 static GdkPixmap *unreadmail_bitmap;
 static GdkPixmap *newmail_bitmap;
 static GdkPixmap *unreadmail_pixmap;
 static GdkPixmap *unreadmail_bitmap;

+static GdkPixmap *newmarkedmail_pixmap;
+static GdkPixmap *newmarkedmail_bitmap;
+static GdkPixmap *unreadmarkedmail_pixmap;
+static GdkPixmap *unreadmarkedmail_bitmap;

 static GdkPixmap *nomail_pixmap;
 static GdkPixmap *nomail_bitmap;
 
 static GdkPixmap *nomail_pixmap;
 static GdkPixmap *nomail_bitmap;
 


@@ -67,6 +73,7 @@ guint destroy_signal_id;
 typedef enum
 {
        TRAYICON_NEW,
 typedef enum
 {
        TRAYICON_NEW,

+       TRAYICON_NEWMARKED,

        TRAYICON_UNREAD,
        TRAYICON_UNREADMARKED,
        TRAYICON_NOTHING,
        TRAYICON_UNREAD,
        TRAYICON_UNREADMARKED,
        TRAYICON_NOTHING,


@@ -100,11 +107,18 @@ static void set_trayicon_pixmap(TrayIconType icontype)
                pixmap = newmail_pixmap;
                bitmap = newmail_bitmap;
                break;
                pixmap = newmail_pixmap;
                bitmap = newmail_bitmap;
                break;

+       case TRAYICON_NEWMARKED:
+               pixmap = newmarkedmail_pixmap;
+               bitmap = newmarkedmail_bitmap;
+               break;

        case TRAYICON_UNREAD:
        case TRAYICON_UNREAD:

-       case TRAYICON_UNREADMARKED:

                pixmap = unreadmail_pixmap;
                bitmap = unreadmail_bitmap;
                break;
                pixmap = unreadmail_pixmap;
                bitmap = unreadmail_bitmap;
                break;

+       case TRAYICON_UNREADMARKED:
+               pixmap = unreadmarkedmail_pixmap;
+               bitmap = unreadmarkedmail_bitmap;
+               break;

        default:
                pixmap = nomail_pixmap;
                bitmap = nomail_bitmap;
        default:
                pixmap = nomail_pixmap;
                bitmap = nomail_bitmap;


@@ -120,14 +134,24 @@ static void update(void)
 {
        gint new, unread, unreadmarked, total;
        gchar *buf;
 {
        gint new, unread, unreadmarked, total;
        gchar *buf;

+       TrayIconType icontype = TRAYICON_NOTHING;

 
        folder_count_total_msgs(&new, &unread, &unreadmarked, &total);
        buf = g_strdup_printf("New %d, Unread: %d, Total: %d", new, unread, total);
 
         gtk_tooltips_set_tip(tooltips, eventbox, buf, "");
        g_free(buf);
 
        folder_count_total_msgs(&new, &unread, &unreadmarked, &total);
        buf = g_strdup_printf("New %d, Unread: %d, Total: %d", new, unread, total);
 
         gtk_tooltips_set_tip(tooltips, eventbox, buf, "");
        g_free(buf);

-
-       set_trayicon_pixmap(new > 0 ? TRAYICON_NEW : (unread > 0 ? TRAYICON_UNREAD : TRAYICON_NOTHING));
+       
+       if (new > 0 && unreadmarked > 0)
+               icontype = TRAYICON_NEWMARKED;
+       else if (new > 0)
+               icontype = TRAYICON_NEW;
+       else if (unreadmarked > 0)
+               icontype = TRAYICON_UNREADMARKED;
+       else if (unread > 0)
+               icontype = TRAYICON_UNREAD;
+
+       set_trayicon_pixmap(icontype);

 }
 
 static gboolean folder_item_update_hook(gpointer source, gpointer data)
 }
 
 static gboolean folder_item_update_hook(gpointer source, gpointer data)


@@ -196,6 +220,8 @@ static void create_trayicon()
         PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap, nomail_bitmap, nomail_xpm);
         PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap, unreadmail_bitmap, unreadmail_xpm);
         PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap, newmail_bitmap, newmail_xpm);
         PIXMAP_CREATE(GTK_WIDGET(trayicon), nomail_pixmap, nomail_bitmap, nomail_xpm);
         PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmail_pixmap, unreadmail_bitmap, unreadmail_xpm);
         PIXMAP_CREATE(GTK_WIDGET(trayicon), newmail_pixmap, newmail_bitmap, newmail_xpm);

+        PIXMAP_CREATE(GTK_WIDGET(trayicon), unreadmarkedmail_pixmap, unreadmarkedmail_bitmap, unreadmarkedmail_xpm);
+        PIXMAP_CREATE(GTK_WIDGET(trayicon), newmarkedmail_pixmap, newmarkedmail_bitmap, newmarkedmail_xpm);

 
         eventbox = gtk_event_box_new();
         gtk_container_set_border_width(GTK_CONTAINER(eventbox), 0);
 
         eventbox = gtk_event_box_new();
         gtk_container_set_border_width(GTK_CONTAINER(eventbox), 0);