gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source 
* 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
This commit is contained in:
Colin Leroy 2004-11-24 12:57:09 +00:00
parent 97e5c74d6d
commit 4c2605a1cd
6 changed files with 43 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog-gtk2.claws
View file

@ -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

1
PATCHSETS
View file

@ -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.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

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=9
MICRO_VERSION=12
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=168
EXTRA_VERSION=169
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=.1

2
src/plugins/pgpmime/plugin.c
View file

@ -38,7 +38,7 @@ gint plugin_init(gchar **error)
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;
}

4
src/plugins/trayicon/Makefile.am
View file

@ -29,5 +29,7 @@ AM_CPPFLAGS = \
EXTRA_DIST = \
README \
newmail.xpm \
newmarkedmail.xpm \
nomail.xpm \
unreadmail.xpm
unreadmail.xpm \
unreadmarkedmail.xpm

30
src/plugins/trayicon/trayicon.c
View file

@ -43,6 +43,8 @@
#include "gtk/manage_window.h"
#include "eggtrayicon.h"
#include "newmarkedmail.xpm"
#include "unreadmarkedmail.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 *newmarkedmail_pixmap;
static GdkPixmap *newmarkedmail_bitmap;
static GdkPixmap *unreadmarkedmail_pixmap;
static GdkPixmap *unreadmarkedmail_bitmap;
static GdkPixmap *nomail_pixmap;
static GdkPixmap *nomail_bitmap;
@ -67,6 +73,7 @@ guint destroy_signal_id;
typedef enum
{
TRAYICON_NEW,
TRAYICON_NEWMARKED,
TRAYICON_UNREAD,
TRAYICON_UNREADMARKED,
TRAYICON_NOTHING,
@ -100,11 +107,18 @@ static void set_trayicon_pixmap(TrayIconType icontype)
pixmap = newmail_pixmap;
bitmap = newmail_bitmap;
break;
case TRAYICON_NEWMARKED:
pixmap = newmarkedmail_pixmap;
bitmap = newmarkedmail_bitmap;
break;
case TRAYICON_UNREAD:
case TRAYICON_UNREADMARKED:
pixmap = unreadmail_pixmap;
bitmap = unreadmail_bitmap;
break;
case TRAYICON_UNREADMARKED:
pixmap = unreadmarkedmail_pixmap;
bitmap = unreadmarkedmail_bitmap;
break;
default:
pixmap = nomail_pixmap;
bitmap = nomail_bitmap;
@ -120,14 +134,24 @@ static void update(void)
{
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);
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(new > 0 ? TRAYICON_NEW : (unread > 0 ? TRAYICON_UNREAD : TRAYICON_NOTHING));
set_trayicon_pixmap(icontype);
}
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), 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);