2009-01-02 [colin] 3.7.0cvs10
* src/gtk/gtkutils.c * src/pixmaps/claws-mail_icon.xpm Use pixbuf for app icon, and make the app icon a bit nicer
This commit is contained in:
parent
19079cdade
commit
98c951c32d
5 changed files with 1545 additions and 1213 deletions
|
@ -1,3 +1,10 @@
|
|||
2009-01-02 [colin] 3.7.0cvs10
|
||||
|
||||
* src/gtk/gtkutils.c
|
||||
* src/pixmaps/claws-mail_icon.xpm
|
||||
Use pixbuf for app icon, and make the app icon
|
||||
a bit nicer
|
||||
|
||||
2009-01-02 [colin] 3.7.0cvs9
|
||||
|
||||
* src/uri_opener.c
|
||||
|
|
|
@ -3671,3 +3671,4 @@
|
|||
( cvs diff -u -r 1.96.2.212 -r 1.96.2.213 src/textview.c; ) > 3.7.0cvs7.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
|
||||
|
|
|
@ -11,7 +11,7 @@ MINOR_VERSION=7
|
|||
MICRO_VERSION=0
|
||||
INTERFACE_AGE=0
|
||||
BINARY_AGE=0
|
||||
EXTRA_VERSION=9
|
||||
EXTRA_VERSION=10
|
||||
EXTRA_RELEASE=
|
||||
EXTRA_GTK2_VERSION=
|
||||
|
||||
|
|
|
@ -710,30 +710,28 @@ void gtkut_widget_init(void)
|
|||
|
||||
void gtkut_widget_set_app_icon(GtkWidget *widget)
|
||||
{
|
||||
#include "pixmaps/claws-mail.xpm"
|
||||
static GdkPixmap *sylpheedclawsxpm;
|
||||
static GdkBitmap *sylpheedclawsxpmmask;
|
||||
static GdkPixbuf *icon = NULL;
|
||||
|
||||
g_return_if_fail(widget != NULL);
|
||||
g_return_if_fail(widget->window != NULL);
|
||||
if (!sylpheedclawsxpm) {
|
||||
PIXMAP_CREATE(widget, sylpheedclawsxpm, sylpheedclawsxpmmask,
|
||||
claws_mail_xpm);
|
||||
if (!icon) {
|
||||
stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
|
||||
}
|
||||
gdk_window_set_icon(widget->window, NULL, sylpheedclawsxpm, sylpheedclawsxpmmask);
|
||||
if (icon)
|
||||
gtk_window_set_icon(GTK_WINDOW(widget), icon);
|
||||
}
|
||||
|
||||
void gtkut_widget_set_composer_icon(GtkWidget *widget)
|
||||
{
|
||||
static GdkPixmap *xpm;
|
||||
static GdkBitmap *bmp;
|
||||
|
||||
static GdkPixbuf *icon = NULL;
|
||||
|
||||
g_return_if_fail(widget != NULL);
|
||||
g_return_if_fail(widget->window != NULL);
|
||||
if (!xpm) {
|
||||
stock_pixmap_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &xpm, &bmp);
|
||||
}
|
||||
gdk_window_set_icon(widget->window, NULL, xpm, bmp);
|
||||
if (!icon) {
|
||||
stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
|
||||
}
|
||||
if (icon)
|
||||
gtk_window_set_icon(GTK_WINDOW(widget), icon);
|
||||
}
|
||||
|
||||
static gboolean move_bar = FALSE;
|
||||
|
|
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue