aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGediminas Paulauskas <menesis@delfi.lt>2001-07-05 04:46:15 +0800
committerGediminas Paulauskas <menesis@src.gnome.org>2001-07-05 04:46:15 +0800
commit1e5fac65aa65ed25c18ead0a13552e5ec98ed53f (patch)
treef8cdc372582d638564fa0b2123885f5202df3f41
parentde9d730a34bc18837e49e5da3101852e2ee41325 (diff)
downloadgsoc2013-evolution-1e5fac65aa65ed25c18ead0a13552e5ec98ed53f.tar.gz
gsoc2013-evolution-1e5fac65aa65ed25c18ead0a13552e5ec98ed53f.tar.zst
gsoc2013-evolution-1e5fac65aa65ed25c18ead0a13552e5ec98ed53f.zip
set "pixname" value only if pixbuf was loaded successfully. Otherwise
2001-07-04 Gediminas Paulauskas <menesis@delfi.lt> * evolution-shell-component-utils.c (e_pixmaps_update): set "pixname" value only if pixbuf was loaded successfully. Otherwise component crashes if image is not found. Should be checked for sanity in bonobo_ui_component_set_prop IMHO. 2001-07-04 Gediminas Paulauskas <menesis@delfi.lt> * Makefile.am: install apply-filters-16.xpm 2001-07-04 Gediminas Paulauskas <menesis@delfi.lt> * evolution-mail-message.xml: MessageApplyFilters now has an icon. 2001-07-04 Gediminas Paulauskas <menesis@delfi.lt> * folder-browser-ui.c (message_pixcache): set icon for ApplyFilters command. svn path=/trunk/; revision=10783
-rw-r--r--art/ChangeLog10
-rw-r--r--art/Makefile.am1
-rw-r--r--mail/ChangeLog5
-rw-r--r--mail/folder-browser-ui.c1
-rw-r--r--shell/ChangeLog7
-rw-r--r--shell/evolution-shell-component-utils.c11
-rw-r--r--ui/ChangeLog4
-rw-r--r--ui/evolution-mail-message.xml3
8 files changed, 34 insertions, 8 deletions
diff --git a/art/ChangeLog b/art/ChangeLog
index 6104451db7..e5be694857 100644
--- a/art/ChangeLog
+++ b/art/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-04 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * Makefile.am: install apply-filters-16.xpm
+
2001-07-03 Tuomas Kuosmanen <tigert@ximian.com>
* cut.png, copy.png, paste.png: icons for cut/copy/paste to fit
@@ -8,7 +12,6 @@
* print.xpm, print-preview.xpm: nat didn't like the jaggy
version. This one is based on tuomas 48x48 print icon.
-
2001-06-30 Ettore Perazzoli <ettore@ximian.com>
* Makefile.am (buttons_DATA): Add `print.png', `next-message.png',
@@ -52,9 +55,8 @@
* apply-filters-16.xpm: for mailer menu.
* vfolder-16.xpm: vfolder icon for menu items
- * hand-16.xpm: originally ment for customize toolbars. might not
- work
- * edit-16.xpm: edit message (message open)
+ * hand-16.xpm: originally ment for customize toolbars. might not work
+ * edit-16.xpm: edit message (message open)
2001-06-13 Jakub Steiner <jimmac@ximian.com>
diff --git a/art/Makefile.am b/art/Makefile.am
index 382b0c88a2..9b3a9c0fd5 100644
--- a/art/Makefile.am
+++ b/art/Makefile.am
@@ -1,5 +1,6 @@
imagesdir = $(datadir)/images/evolution
images_DATA = \
+ apply-filters-16.xpm \
bcg.png \
configure_16_addressbook.xpm \
configure_16_calendar.xpm \
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 663f8cb6fe..9a8c8154d4 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,8 @@
+2001-07-04 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * folder-browser-ui.c (message_pixcache): set icon for ApplyFilters
+ command.
+
2001-07-04 Jeffrey Stedfast <fejj@ximian.com>
* mail-config.c (mail_config_set_show_preview): Revert Sam's changes.
diff --git a/mail/folder-browser-ui.c b/mail/folder-browser-ui.c
index e64435fc37..37fc12cf07 100644
--- a/mail/folder-browser-ui.c
+++ b/mail/folder-browser-ui.c
@@ -121,6 +121,7 @@ static EPixmap message_pixcache [] = {
E_PIXMAP ("/commands/MessageReplyAll", "reply_to_all.xpm"),
E_PIXMAP ("/commands/MessageReplySender", "reply.xpm"),
E_PIXMAP ("/commands/MessageForward", "forward.xpm"),
+ E_PIXMAP ("/commands/MessageApplyFilters", "apply-filters-16.xpm"),
E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplySender", "buttons/reply.png"),
E_PIXMAP ("/Toolbar/MailMessageToolbar/MessageReplyAll", "buttons/reply-to-all.png"),
diff --git a/shell/ChangeLog b/shell/ChangeLog
index 5877e2c863..d373b3bfa7 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,10 @@
+2001-07-04 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * evolution-shell-component-utils.c (e_pixmaps_update): set
+ "pixname" value only if pixbuf was loaded successfully. Otherwise
+ component crashes if image is not found. Should be checked for
+ sanity in bonobo_ui_component_set_prop IMHO.
+
2001-07-03 Aaron Weber <aaron@ximian.com>
* main.c (development_warning): Revised to make it less scary.
diff --git a/shell/evolution-shell-component-utils.c b/shell/evolution-shell-component-utils.c
index 5e3504352f..e056fc54b3 100644
--- a/shell/evolution-shell-component-utils.c
+++ b/shell/evolution-shell-component-utils.c
@@ -60,13 +60,18 @@ void e_pixmaps_update (BonoboUIComponent *uic, EPixmap *pixcache)
} else {
pixcache [i].pixbuf = bonobo_ui_util_pixbuf_to_xml (pixbuf);
gdk_pixbuf_unref (pixbuf);
+ bonobo_ui_component_set_prop (uic,
+ pixcache [i].path, "pixname",
+ pixcache [i].pixbuf, NULL);
}
g_free (path);
+ } else {
+ bonobo_ui_component_set_prop (uic, pixcache [i].path,
+ "pixname",
+ pixcache [i].pixbuf,
+ NULL);
}
- bonobo_ui_component_set_prop (uic, pixcache [i].path,
- "pixname", pixcache [i].pixbuf,
- NULL);
}
}
diff --git a/ui/ChangeLog b/ui/ChangeLog
index 5a46f96ed0..64ebb0421c 100644
--- a/ui/ChangeLog
+++ b/ui/ChangeLog
@@ -1,3 +1,7 @@
+2001-07-04 Gediminas Paulauskas <menesis@delfi.lt>
+
+ * evolution-mail-message.xml: MessageApplyFilters now has an icon.
+
2001-07-03 Jason Leach <jleach@ximian.com>
[Bug #3612: Accelerator for attach file in composer]
diff --git a/ui/evolution-mail-message.xml b/ui/evolution-mail-message.xml
index e75d5c3639..08112257e0 100644
--- a/ui/evolution-mail-message.xml
+++ b/ui/evolution-mail-message.xml
@@ -30,7 +30,8 @@
<cmd name="MessageApplyFilters"
_tip="Apply filter rules to the selected messages"
- accel="*Control*y"/>
+ accel="*Control*y"
+ pixtype="pixbuf"/>
<cmd name="MessageCopy"
_tip="Copy selected messages to another folder"