[Commits] [SCM] claws branch, master, updated. 3.13.2-188-g3ed994a
ticho at claws-mail.org
ticho at claws-mail.org
Wed Jul 20 23:48:43 CEST 2016
The branch, master has been updated
via 3ed994a5e61da4972594c68def857cb58039bd99 (commit)
from bbae17b7dfbcd8850f5383583d656d903252989c (commit)
Summary of changes:
src/addr_compl.c | 4 +-
src/addressadd.c | 5 +-
src/addressbook.c | 22 ++--
src/addressbook_foldersel.c | 5 +-
src/editaddress.c | 2 +-
src/foldersel.c | 9 +-
src/folderview.c | 103 +++++++++----------
src/gtk/about.c | 6 +-
src/gtk/gtkutils.c | 8 +-
src/gtk/icon_legend.c | 2 +-
src/importldif.c | 3 +-
src/inc.c | 9 +-
src/main.c | 2 +-
src/mainwindow.c | 8 +-
src/mimeview.c | 12 +--
src/noticeview.c | 4 +-
.../notification/notification_foldercheck.c | 6 +-
src/plugins/notification/notification_pixbuf.c | 20 ++--
src/plugins/pdf_viewer/poppler_viewer.c | 15 +--
src/prefs_themes.c | 3 +-
src/prefs_toolbar.c | 14 +--
src/stock_pixmap.c | 15 ++-
src/stock_pixmap.h | 9 +-
src/summaryview.c | 106 ++++++++------------
src/toolbar.c | 8 +-
src/wizard.c | 9 +-
26 files changed, 182 insertions(+), 227 deletions(-)
- Log -----------------------------------------------------------------
commit 3ed994a5e61da4972594c68def857cb58039bd99
Author: Andrej Kacian <ticho at claws-mail.org>
Date: Wed Jul 20 23:46:39 2016 +0200
Remove unused GtkWidget* argument in stock_pix* functions.
stock_pixmap_widget()
stock_pixmap_widget_with_overlay()
stock_pixbuf_gdk()
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 9eea26f..e78d90f 100644
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -990,11 +990,11 @@ static void addrcompl_add_entry( CompletionWindow *cw, gchar *address ) {
GdkPixbuf *pixbuf;
if (!group_pixbuf) {
- stock_pixbuf_gdk(cw->list_view, STOCK_PIXMAP_ADDR_TWO, &group_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ADDR_TWO, &group_pixbuf);
g_object_ref(G_OBJECT(group_pixbuf));
}
if (!email_pixbuf) {
- stock_pixbuf_gdk(cw->list_view, STOCK_PIXMAP_ADDR_ONE, &email_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ADDR_ONE, &email_pixbuf);
g_object_ref(G_OBJECT(email_pixbuf));
}
/* g_print( "\t\tAdding :%s\n", address ); */
diff --git a/src/addressadd.c b/src/addressadd.c
index a936fd9..a44275c 100644
--- a/src/addressadd.c
+++ b/src/addressadd.c
@@ -305,9 +305,8 @@ static void addressadd_create( void ) {
gtk_widget_show_all( window );
- stock_pixbuf_gdk( window, STOCK_PIXMAP_BOOK, &bookXpm );
- stock_pixbuf_gdk( window, STOCK_PIXMAP_DIR_OPEN,
- &folderXpm );
+ stock_pixbuf_gdk(STOCK_PIXMAP_BOOK, &bookXpm );
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderXpm );
}
#ifndef USE_ALT_ADDRBOOK
diff --git a/src/addressbook.c b/src/addressbook.c
index 80599f8..28040bd 100644
--- a/src/addressbook.c
+++ b/src/addressbook.c
@@ -4855,17 +4855,17 @@ static void addrbookctl_build_icons( GtkWidget *window ) {
g_object_unref(ldapxpm);
if (addrsearchxpm)
g_object_unref(addrsearchxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_INTERFACE, &interfacexpm );
- stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_GROUP, &groupxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_VCARD, &vcardxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_BOOK, &bookxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS, &addressxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_JPILOT, &jpilotxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_CATEGORY, &categoryxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_LDAP, &ldapxpm);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INTERFACE, &interfacexpm );
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_GROUP, &groupxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_VCARD, &vcardxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_BOOK, &bookxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ADDRESS, &addressxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_JPILOT, &jpilotxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CATEGORY, &categoryxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_LDAP, &ldapxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ADDRESS_SEARCH, &addrsearchxpm);
UPDATE_ICON_ATCI(ADDR_INTERFACE,folderxpm,folderopenxpm);
UPDATE_ICON_ATCI(ADDR_BOOK,bookxpm,bookxpm);
diff --git a/src/addressbook_foldersel.c b/src/addressbook_foldersel.c
index a15aae5..d53f44a 100644
--- a/src/addressbook_foldersel.c
+++ b/src/addressbook_foldersel.c
@@ -228,9 +228,8 @@ static void addressbook_foldersel_create( void )
gtk_widget_show_all( window );
- stock_pixbuf_gdk( window, STOCK_PIXMAP_BOOK, &bookXpm);
- stock_pixbuf_gdk( window, STOCK_PIXMAP_DIR_OPEN,
- &folderXpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_BOOK, &bookXpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderXpm);
}
static void addressbook_foldersel_load_folder( GtkCMCTreeNode *parentNode, ItemFolder *parentFolder,
diff --git a/src/editaddress.c b/src/editaddress.c
index ac22b18..da748ae 100644
--- a/src/editaddress.c
+++ b/src/editaddress.c
@@ -823,7 +823,7 @@ static void addressbook_edit_person_clear_picture(void)
{
GdkPixbuf *pixbuf;
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_ANONYMOUS, &pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ANONYMOUS, &pixbuf);
personeditdlg.picture_set = FALSE;
cm_menu_set_sensitive("EditAddressPopup/UnsetPicture", personeditdlg.picture_set);
gtk_image_set_from_pixbuf(GTK_IMAGE(personeditdlg.image), pixbuf);
diff --git a/src/foldersel.c b/src/foldersel.c
index 0b77f15..4ecb9d0 100644
--- a/src/foldersel.c
+++ b/src/foldersel.c
@@ -362,12 +362,9 @@ static void foldersel_create(void)
static void foldersel_init(void)
{
- stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_CLOSE,
- &folder_pixbuf);
- stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_OPEN,
- &folderopen_pixbuf);
- stock_pixbuf_gdk(treeview, STOCK_PIXMAP_DIR_NOSELECT,
- &foldernoselect_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE, &folder_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderopen_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT, &foldernoselect_pixbuf);
}
void foldersel_reflect_prefs_pixmap_theme(void)
diff --git a/src/folderview.c b/src/folderview.c
index 909b2ad..4ddd386 100644
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -335,12 +335,9 @@ static void folderview_column_set_titles(FolderView *folderview)
/* CLAWS: titles for "New" and "Unread" show new & unread pixmaps
* instead text (text overflows making them unreadable and ugly) */
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_NEW,
- &newxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_UNREAD,
- &unreadxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_READ,
- &readxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_NEW, &newxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_UNREAD, &unreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_READ, &readxpm);
label_folder = gtk_label_new(_("Folder"));
label_new = gtk_image_new_from_pixbuf(newxpm);
@@ -629,52 +626,52 @@ void folderview_init(FolderView *folderview)
GdkColor gdk_color;
PangoFontDescription *normal_font;
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN, &inboxopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_HRM, &inboxopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE, &outboxxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_HRM, &outboxhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN, &outboxopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_HRM, &outboxopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_HRM, &folderhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM, &folderopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN, &trashopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_HRM, &trashopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE, &trashxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_HRM, &trashhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE, &queuexpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_NOSELECT, &noselectxpm);
-
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_MARK, &m_inboxxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_CLOSE_HRM_MARK, &m_inboxhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_MARK, &m_inboxopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_INBOX_OPEN_HRM_MARK, &m_inboxopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_MARK, &m_outboxxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_CLOSE_HRM_MARK, &m_outboxhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_MARK, &m_outboxopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_OUTBOX_OPEN_HRM_MARK, &m_outboxopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_MARK, &m_folderxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_CLOSE_HRM_MARK, &m_folderhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_MARK, &m_folderopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DIR_OPEN_HRM_MARK, &m_folderopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_MARK, &m_trashopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_OPEN_HRM_MARK, &m_trashopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_MARK, &m_trashxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_TRASH_CLOSE_HRM_MARK, &m_trashhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_MARK, &m_queuexpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_CLOSE_HRM_MARK, &m_queuehrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_MARK, &m_queueopenxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_QUEUE_OPEN_HRM_MARK, &m_queueopenhrmxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DRAFTS_CLOSE_MARK, &m_draftsxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DRAFTS_OPEN_MARK, &m_draftsopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE, &inboxxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE_HRM, &inboxhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_OPEN, &inboxopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_OPEN_HRM, &inboxopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_CLOSE, &outboxxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_CLOSE_HRM, &outboxhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_OPEN, &outboxopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_OPEN_HRM, &outboxopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE, &folderxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE_HRM, &folderhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN, &folderopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN_HRM, &folderopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_OPEN, &trashopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_OPEN_HRM, &trashopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_CLOSE, &trashxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_CLOSE_HRM, &trashhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_CLOSE, &queuexpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_CLOSE_HRM, &queuehrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_OPEN, &queueopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_OPEN_HRM, &queueopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_CLOSE, &draftsxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_OPEN, &draftsopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT, &noselectxpm);
+
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE_MARK, &m_inboxxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_CLOSE_HRM_MARK, &m_inboxhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_OPEN_MARK, &m_inboxopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_INBOX_OPEN_HRM_MARK, &m_inboxopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_CLOSE_MARK, &m_outboxxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_CLOSE_HRM_MARK, &m_outboxhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_OPEN_MARK, &m_outboxopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_OUTBOX_OPEN_HRM_MARK, &m_outboxopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE_MARK, &m_folderxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE_HRM_MARK, &m_folderhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN_MARK, &m_folderopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN_HRM_MARK, &m_folderopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_OPEN_MARK, &m_trashopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_OPEN_HRM_MARK, &m_trashopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_CLOSE_MARK, &m_trashxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRASH_CLOSE_HRM_MARK, &m_trashhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_CLOSE_MARK, &m_queuexpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_CLOSE_HRM_MARK, &m_queuehrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_OPEN_MARK, &m_queueopenxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUEUE_OPEN_HRM_MARK, &m_queueopenhrmxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_CLOSE_MARK, &m_draftsxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DRAFTS_OPEN_MARK, &m_draftsopenxpm);
normal_font = pango_font_description_from_string(NORMAL_FONT);
if (normal_font) {
@@ -1517,7 +1514,7 @@ static void folderview_update_node(FolderView *folderview, GtkCMCTreeNode *node)
if (item->search_match) {
if (!searchicon) {
- stock_pixbuf_gdk(folderview->ctree, STOCK_PIXMAP_QUICKSEARCH,
+ stock_pixbuf_gdk(STOCK_PIXMAP_QUICKSEARCH,
&searchicon);
}
xpm = openxpm = searchicon;
diff --git a/src/gtk/about.c b/src/gtk/about.c
index d5a3b3e..86570ac 100644
--- a/src/gtk/about.c
+++ b/src/gtk/about.c
@@ -406,8 +406,8 @@ static GtkWidget *about_create_child_page_features(void)
gtk_text_buffer_create_tag(buffer, "bold", "weight", PANGO_WEIGHT_BOLD,
NULL);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_ON, &active_pixbuf);
- stock_pixbuf_gdk(window, STOCK_PIXMAP_CHECKBOX_OFF, &inactive_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CHECKBOX_ON, &active_pixbuf);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CHECKBOX_OFF, &inactive_pixbuf);
#if HAVE_LIBCOMPFACE
gtk_text_buffer_insert_pixbuf(buffer, &iter, active_pixbuf);
@@ -804,7 +804,7 @@ static void about_create(void)
gtk_table_set_row_spacings (GTK_TABLE (table), 8);
gtk_table_set_col_spacings (GTK_TABLE (table), 8);
- image = stock_pixmap_widget(window, STOCK_PIXMAP_CLAWS_MAIL_LOGO);
+ image = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_LOGO);
gtk_table_attach (GTK_TABLE (table), image, 0, 1, 0, 1,
(GtkAttachOptions) (GTK_EXPAND),
(GtkAttachOptions) (0), 0, 0);
diff --git a/src/gtk/gtkutils.c b/src/gtk/gtkutils.c
index b30a46b..c2a051b 100644
--- a/src/gtk/gtkutils.c
+++ b/src/gtk/gtkutils.c
@@ -710,8 +710,8 @@ void gtkut_widget_set_app_icon(GtkWidget *widget)
cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
if (!icon_list) {
GdkPixbuf *icon = NULL, *big_icon = NULL;
- stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
- stock_pixbuf_gdk(widget, STOCK_PIXMAP_CLAWS_MAIL_LOGO, &big_icon);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLAWS_MAIL_LOGO, &big_icon);
if (icon)
icon_list = g_list_append(icon_list, icon);
if (big_icon)
@@ -729,8 +729,8 @@ void gtkut_widget_set_composer_icon(GtkWidget *widget)
cm_return_if_fail(gtk_widget_get_window(widget) != NULL);
if (!icon_list) {
GdkPixbuf *icon = NULL, *big_icon = NULL;
- stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE, &icon);
- stock_pixbuf_gdk(widget, STOCK_PIXMAP_MAIL_COMPOSE_LOGO, &big_icon);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MAIL_COMPOSE, &icon);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MAIL_COMPOSE_LOGO, &big_icon);
if (icon)
icon_list = g_list_append(icon_list, icon);
if (big_icon)
diff --git a/src/gtk/icon_legend.c b/src/gtk/icon_legend.c
index abe1a39..8b7affd 100644
--- a/src/gtk/icon_legend.c
+++ b/src/gtk/icon_legend.c
@@ -156,7 +156,7 @@ static void legend_create(void)
gtk_table_set_col_spacings(GTK_TABLE(table), 8);
for (i = 0; i < ICONS; ++i) {
- icon_label = stock_pixmap_widget(window, legend_icons[i]);
+ icon_label = stock_pixmap_widget(legend_icons[i]);
gtk_misc_set_alignment (GTK_MISC (icon_label), 0.5, 0.5);
gtk_table_attach(GTK_TABLE(table), icon_label, 0, 1, i, i+1,
GTK_FILL, 0, 0, 0);
diff --git a/src/importldif.c b/src/importldif.c
index 242edd9..bd1a917 100644
--- a/src/importldif.c
+++ b/src/importldif.c
@@ -1055,8 +1055,7 @@ AddressBookFile *addressbook_imp_ldif( AddressIndex *addrIndex ) {
gtk_notebook_set_current_page( GTK_NOTEBOOK(impldif_dlg.notebook), PAGE_FILE_INFO );
gtk_widget_set_sensitive( impldif_dlg.btnPrev, FALSE );
gtk_widget_set_sensitive( impldif_dlg.btnNext, TRUE );
- stock_pixbuf_gdk( impldif_dlg.window, STOCK_PIXMAP_MARK,
- &markxpm );
+ stock_pixbuf_gdk(STOCK_PIXMAP_MARK, &markxpm );
imp_ldif_message();
gtk_widget_grab_focus(impldif_dlg.entryFile);
diff --git a/src/inc.c b/src/inc.c
index 745aedc..38f66ee 100644
--- a/src/inc.c
+++ b/src/inc.c
@@ -427,12 +427,9 @@ static IncProgressDialog *inc_progress_dialog_create(gboolean autocheck)
progress_dialog_get_fraction(progress);
- stock_pixbuf_gdk(progress->treeview, STOCK_PIXMAP_COMPLETE,
- &okpix);
- stock_pixbuf_gdk(progress->treeview, STOCK_PIXMAP_CONTINUE,
- ¤tpix);
- stock_pixbuf_gdk(progress->treeview, STOCK_PIXMAP_ERROR,
- &errorpix);
+ stock_pixbuf_gdk(STOCK_PIXMAP_COMPLETE, &okpix);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CONTINUE, ¤tpix);
+ stock_pixbuf_gdk(STOCK_PIXMAP_ERROR, &errorpix);
if (!geometry.min_height) {
geometry.min_width = 460;
diff --git a/src/main.c b/src/main.c
index 388a66f..4c39b50 100644
--- a/src/main.c
+++ b/src/main.c
@@ -1279,7 +1279,7 @@ int main(int argc, char *argv[])
}
#endif
gtkut_widget_init();
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLAWS_MAIL_ICON, &icon);
gtk_window_set_default_icon(icon);
folderview_initialize();
diff --git a/src/mainwindow.c b/src/mainwindow.c
index a82486f..399067e 100644
--- a/src/mainwindow.c
+++ b/src/mainwindow.c
@@ -1966,8 +1966,8 @@ MainWindow *main_window_create()
gtk_widget_set_size_request(progressbar, 120, 1);
gtk_box_pack_start(GTK_BOX(hbox_stat), progressbar, FALSE, FALSE, 0);
- online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE);
- offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE);
+ online_pixmap = stock_pixmap_widget(STOCK_PIXMAP_ONLINE);
+ offline_pixmap = stock_pixmap_widget(STOCK_PIXMAP_OFFLINE);
online_switch = gtk_button_new ();
gtkut_widget_set_can_focus(online_switch, FALSE);
CLAWS_SET_TIP(online_switch,
@@ -2334,13 +2334,13 @@ static gboolean reflect_prefs_timeout_cb(gpointer data)
addressbook_reflect_prefs_pixmap_theme();
#endif
#ifndef GENERIC_UMPC
- pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_ONLINE);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_ONLINE);
gtk_container_remove(GTK_CONTAINER(mainwin->online_switch),
mainwin->online_pixmap);
gtk_container_add (GTK_CONTAINER(mainwin->online_switch), pixmap);
gtk_widget_show(pixmap);
mainwin->online_pixmap = pixmap;
- pixmap = stock_pixmap_widget(mainwin->hbox_stat, STOCK_PIXMAP_OFFLINE);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_OFFLINE);
gtk_container_remove(GTK_CONTAINER(mainwin->offline_switch),
mainwin->offline_pixmap);
gtk_container_add (GTK_CONTAINER(mainwin->offline_switch), pixmap);
diff --git a/src/mimeview.c b/src/mimeview.c
index 69e5906..33ccc7e 100644
--- a/src/mimeview.c
+++ b/src/mimeview.c
@@ -2504,29 +2504,29 @@ static void icon_list_append_icon (MimeView *mimeview, MimeInfo *mimeinfo)
case SIGNATURE_UNCHECKED:
case SIGNATURE_CHECK_FAILED:
case SIGNATURE_CHECK_TIMEOUT:
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ pixmap = stock_pixmap_widget_with_overlay(stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_SIGNED, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
case SIGNATURE_OK:
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ pixmap = stock_pixmap_widget_with_overlay(stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_PASSED, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
case SIGNATURE_WARN:
case SIGNATURE_KEY_EXPIRED:
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ pixmap = stock_pixmap_widget_with_overlay(stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_WARN, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
case SIGNATURE_INVALID:
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ pixmap = stock_pixmap_widget_with_overlay(stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_FAILED, OVERLAY_BOTTOM_RIGHT, 6, 3);
break;
}
sigshort = privacy_mimeinfo_sig_info_short(siginfo);
} else if (encrypted != NULL) {
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp,
+ pixmap = stock_pixmap_widget_with_overlay(stockp,
STOCK_PIXMAP_PRIVACY_EMBLEM_ENCRYPTED, OVERLAY_BOTTOM_RIGHT, 6, 3);
} else {
- pixmap = stock_pixmap_widget_with_overlay(mimeview->mainwin->window, stockp, 0,
+ pixmap = stock_pixmap_widget_with_overlay(stockp, 0,
OVERLAY_NONE, 6, 3);
}
gtk_container_add(GTK_CONTAINER(button), pixmap);
diff --git a/src/noticeview.c b/src/noticeview.c
index fdb3daf..da93572 100644
--- a/src/noticeview.c
+++ b/src/noticeview.c
@@ -91,7 +91,7 @@ NoticeView *noticeview_create(MainWindow *mainwin)
gtk_event_box_set_visible_window(GTK_EVENT_BOX(evtbox), FALSE);
gtk_widget_show(evtbox);
- icon = stock_pixmap_widget(noticeview->window, STOCK_PIXMAP_NOTICE_WARN);
+ icon = stock_pixmap_widget(STOCK_PIXMAP_NOTICE_WARN);
gtk_widget_show(icon);
g_signal_connect(G_OBJECT(evtbox), "button-press-event",
@@ -266,7 +266,7 @@ void noticeview_set_icon(NoticeView *noticeview, StockPixmap icon)
{
GdkPixbuf *pixbuf;
- if (stock_pixbuf_gdk(noticeview->window, icon, &pixbuf) < 0)
+ if (stock_pixbuf_gdk(icon, &pixbuf) < 0)
return;
gtk_image_set_from_pixbuf(GTK_IMAGE(noticeview->icon), pixbuf);
diff --git a/src/plugins/notification/notification_foldercheck.c b/src/plugins/notification/notification_foldercheck.c
index d260f6c..0e0989f 100644
--- a/src/plugins/notification/notification_foldercheck.c
+++ b/src/plugins/notification/notification_foldercheck.c
@@ -502,13 +502,13 @@ static void foldercheck_create_window(SpecificFolderArrayEntry *entry)
/* pixbufs */
if(!folder_pixbuf)
- stock_pixbuf_gdk(scrolledwin, STOCK_PIXMAP_DIR_CLOSE,
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_CLOSE,
&folder_pixbuf);
if(!folderopen_pixbuf)
- stock_pixbuf_gdk(scrolledwin, STOCK_PIXMAP_DIR_OPEN,
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_OPEN,
&folderopen_pixbuf);
if(!foldernoselect_pixbuf)
- stock_pixbuf_gdk(scrolledwin, STOCK_PIXMAP_DIR_NOSELECT,
+ stock_pixbuf_gdk(STOCK_PIXMAP_DIR_NOSELECT,
&foldernoselect_pixbuf);
/* Tree store */
diff --git a/src/plugins/notification/notification_pixbuf.c b/src/plugins/notification/notification_pixbuf.c
index 22984fe..4df7f81 100644
--- a/src/plugins/notification/notification_pixbuf.c
+++ b/src/plugins/notification/notification_pixbuf.c
@@ -39,43 +39,43 @@ GdkPixbuf* notification_pixbuf_get(NotificationPixbuf wanted)
FALSE, NULL);
break;
case NOTIFICATION_TRAYICON_NEWMAIL:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_NEWMAIL, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_NEWMAIL, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_NEWMAIL_OFFLINE:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_NEWMAIL_OFFLINE, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_NEWMAIL_OFFLINE, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_NEWMARKEDMAIL:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_NEWMARKEDMAIL, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_NEWMARKEDMAIL, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_NEWMARKEDMAIL_OFFLINE:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_NEWMARKEDMAIL_OFFLINE, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_NEWMARKEDMAIL_OFFLINE, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_NOMAIL:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_NOMAIL, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_NOMAIL, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_NOMAIL_OFFLINE:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_NOMAIL_OFFLINE, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_NOMAIL_OFFLINE, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_UNREADMAIL:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_UNREADMAIL, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_UNREADMAIL, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_UNREADMAIL_OFFLINE:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_UNREADMAIL_OFFLINE, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_UNREADMAIL_OFFLINE, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_UNREADMARKEDMAIL:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_TRAYICON_UNREADMARKEDMAIL_OFFLINE:
- stock_pixbuf_gdk(NULL, STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL_OFFLINE, &(notification_pixbuf[wanted]));
+ stock_pixbuf_gdk(STOCK_PIXMAP_TRAY_UNREADMARKEDMAIL_OFFLINE, &(notification_pixbuf[wanted]));
g_object_ref(notification_pixbuf[wanted]);
break;
case NOTIFICATION_PIXBUF_LAST:
diff --git a/src/plugins/pdf_viewer/poppler_viewer.c b/src/plugins/pdf_viewer/poppler_viewer.c
index a0cecaf..235a01a 100644
--- a/src/plugins/pdf_viewer/poppler_viewer.c
+++ b/src/plugins/pdf_viewer/poppler_viewer.c
@@ -1254,22 +1254,19 @@ static void pdf_viewer_update(MimeViewer *_viewer, gboolean reload_file, int pag
}
if (pdf_viewer_mimepart_get_type(viewer->to_load) == TYPE_PS) {
- stock_pixbuf_gdk(viewer->hbox,
- STOCK_PIXMAP_MIME_PS,
+ stock_pixbuf_gdk(STOCK_PIXMAP_MIME_PS,
&viewer->icon_pixbuf);
gtk_image_set_from_pixbuf(GTK_IMAGE(viewer->icon_type),
viewer->icon_pixbuf);
}
else if (pdf_viewer_mimepart_get_type(viewer->to_load) == TYPE_PDF) {
- stock_pixbuf_gdk(viewer->hbox,
- STOCK_PIXMAP_MIME_PDF,
+ stock_pixbuf_gdk(STOCK_PIXMAP_MIME_PDF,
&viewer->icon_pixbuf);
gtk_image_set_from_pixbuf(GTK_IMAGE(viewer->icon_type),
viewer->icon_pixbuf);
}
else {
- stock_pixbuf_gdk(viewer->hbox,
- STOCK_PIXMAP_MIME_APPLICATION,
+ stock_pixbuf_gdk(STOCK_PIXMAP_MIME_APPLICATION,
&viewer->icon_pixbuf);
gtk_image_set_from_pixbuf(GTK_IMAGE(viewer->icon_type),
viewer->icon_pixbuf);
@@ -1356,8 +1353,7 @@ static void pdf_viewer_update(MimeViewer *_viewer, gboolean reload_file, int pag
main_window_cursor_normal(mainwindow_get_mainwindow());
}
if (viewer->pdf_doc == NULL) {
- stock_pixbuf_gdk(viewer->hbox,
- STOCK_PIXMAP_MIME_APPLICATION,
+ stock_pixbuf_gdk(STOCK_PIXMAP_MIME_APPLICATION,
&viewer->icon_pixbuf);
gtk_image_set_from_pixbuf(GTK_IMAGE(viewer->icon_type), viewer->icon_pixbuf);
@@ -1831,8 +1827,7 @@ static MimeViewer *pdf_viewer_create(void)
/* end treeview */
- stock_pixbuf_gdk(viewer->hbox,
- STOCK_PIXMAP_MIME_TEXT_PLAIN,
+ stock_pixbuf_gdk(STOCK_PIXMAP_MIME_TEXT_PLAIN,
&viewer->icon_pixbuf);
gtk_image_set_from_pixbuf(GTK_IMAGE(viewer->icon_type),
diff --git a/src/prefs_themes.c b/src/prefs_themes.c
index 3d050ba..c9d2ecc 100644
--- a/src/prefs_themes.c
+++ b/src/prefs_themes.c
@@ -632,8 +632,7 @@ static void prefs_themes_display_theme_info(ThemesData *tdata, const ThemeInfo *
save_prefs_path = prefs_common.pixmap_theme_path;
prefs_common.pixmap_theme_path = tdata->displayed;
for (i = 0; i < PREVIEW_ICONS; ++i) {
- stock_pixbuf_gdk(theme->window, prefs_themes_icons[i],
- &(theme->pixbufs[i]));
+ stock_pixbuf_gdk(prefs_themes_icons[i], &(theme->pixbufs[i]));
gtk_image_set_from_pixbuf(GTK_IMAGE(theme->icons[i]),
theme->pixbufs[i]);
}
diff --git a/src/prefs_toolbar.c b/src/prefs_toolbar.c
index a990ee5..45151a6 100644
--- a/src/prefs_toolbar.c
+++ b/src/prefs_toolbar.c
@@ -337,7 +337,7 @@ static void prefs_toolbar_set_displayed(ToolbarPage *prefs_toolbar)
GdkPixbuf *pix;
StockPixmap icon = stock_pixmap_get_icon(item->file);
- stock_pixbuf_gdk(prefs_toolbar->window, icon, &pix);
+ stock_pixbuf_gdk(icon, &pix);
gtk_list_store_set(store, &iter,
SET_ICON, pix,
@@ -515,9 +515,9 @@ static void prefs_toolbar_register(GtkButton *button, ToolbarPage *prefs_toolbar
alertpanel_error(ERROR_MSG_NO_ICON);
return;
}
- stock_pixbuf_gdk(prefs_toolbar->window,
- stock_pixmap_get_icon(prefs_toolbar->item_icon_file),
- &pixbuf);
+ stock_pixbuf_gdk(
+ stock_pixmap_get_icon(prefs_toolbar->item_icon_file),
+ &pixbuf);
if(pixbuf == NULL) {
alertpanel_error(ERROR_MSG_NO_ICON);
return;
@@ -601,7 +601,7 @@ static void prefs_toolbar_substitute(GtkButton *button, ToolbarPage *prefs_toolb
alertpanel_error(ERROR_MSG_NO_ICON);
return;
}
- stock_pixbuf_gdk(prefs_toolbar->window,
+ stock_pixbuf_gdk(
stock_pixmap_get_icon(prefs_toolbar->item_icon_file),
&pixbuf);
if(pixbuf == NULL) {
@@ -864,7 +864,7 @@ static void func_selection_changed(GtkComboBox *action_combo,
prefs_toolbar->item_icon_file = g_strdup(stock_pixmap_get_name(stockp));
gtk_button_set_image(GTK_BUTTON(prefs_toolbar->icon_button),
- stock_pixmap_widget(prefs_toolbar->window, stockp));
+ stock_pixmap_widget(stockp));
}
}
}
@@ -1698,7 +1698,7 @@ static void icon_chooser_create(GtkButton *button, ToolbarPage *prefs_toolbar)
for (i = 0; ToolbarIcons[i] != STOCK_PIXMAP_EMPTY; i++) {
GdkPixbuf *pixbuf;
- stock_pixbuf_gdk(prefs_toolbar->window, ToolbarIcons[i], &pixbuf);
+ stock_pixbuf_gdk(ToolbarIcons[i], &pixbuf);
gtk_list_store_append(store, &iter);
gtk_list_store_set(store, &iter,
diff --git a/src/stock_pixmap.c b/src/stock_pixmap.c
index 0b1796a..70b564b 100644
--- a/src/stock_pixmap.c
+++ b/src/stock_pixmap.c
@@ -399,14 +399,13 @@ static StockPixmapData pixmaps[] =
};
/* return newly constructed GtkPixmap from GdkPixmap */
-GtkWidget *stock_pixmap_widget(GtkWidget *window, StockPixmap icon)
+GtkWidget *stock_pixmap_widget(StockPixmap icon)
{
GdkPixbuf *pixbuf;
- cm_return_val_if_fail(window != NULL, NULL);
cm_return_val_if_fail(icon >= 0 && icon < N_STOCK_PIXMAPS, NULL);
- if (stock_pixbuf_gdk(window, icon, &pixbuf) != -1)
+ if (stock_pixbuf_gdk(icon, &pixbuf) != -1)
return gtk_image_new_from_pixbuf(pixbuf);
return NULL;
@@ -415,7 +414,7 @@ GtkWidget *stock_pixmap_widget(GtkWidget *window, StockPixmap icon)
/*!
*\brief
*/
-gint stock_pixbuf_gdk(GtkWidget *window, StockPixmap icon, GdkPixbuf **pixbuf)
+gint stock_pixbuf_gdk(StockPixmap icon, GdkPixbuf **pixbuf)
{
StockPixmapData *pix_d;
static const char *extension[]={".png", ".xpm", NULL};
@@ -756,7 +755,7 @@ static void pixmap_with_overlay_destroy_cb(GtkWidget *object, OverlayData *data)
* \param border_x size of the border around the base icon (left and right)
* \param border_y size of the border around the base icon (top and bottom)
*/
-GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
+GtkWidget *stock_pixmap_widget_with_overlay(StockPixmap icon,
StockPixmap overlay, OverlayPosition pos,
gint border_x, gint border_y)
{
@@ -769,7 +768,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
data = g_new0(OverlayData, 1);
- stock_wid = stock_pixmap_widget(window, icon);
+ stock_wid = stock_pixmap_widget(icon);
gtk_widget_get_requisition(stock_wid, &requisition);
#if !GTK_CHECK_VERSION(3, 0, 0)
@@ -792,7 +791,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
if (pos == OVERLAY_NONE) {
data->overlay_pixmap = NULL;
} else {
- stock_wid = stock_pixmap_widget(window, overlay);
+ stock_wid = stock_pixmap_widget(overlay);
cr = gdk_cairo_create(gtk_widget_get_window(stock_wid));
stock_pixmap = cairo_get_target(cr);
cairo_surface_reference(stock_pixmap);
@@ -814,7 +813,7 @@ GtkWidget *stock_pixmap_widget_with_overlay(GtkWidget *window, StockPixmap icon,
if (pos == OVERLAY_NONE) {
data->overlay_pixmap = NULL;
} else {
- stock_wid = stock_pixmap_widget(window, overlay);
+ stock_wid = stock_pixmap_widget(overlay);
stock_pixbuf = gtk_image_get_pixbuf(GTK_IMAGE(stock_wid));
g_object_ref(stock_pixbuf);
data->overlay_pixbuf = stock_pixbuf;
diff --git a/src/stock_pixmap.h b/src/stock_pixmap.h
index befcf62..0e992de 100644
--- a/src/stock_pixmap.h
+++ b/src/stock_pixmap.h
@@ -203,17 +203,14 @@ typedef enum {
OVERLAY_BOTTOM_RIGHT
} OverlayPosition;
-GtkWidget *stock_pixmap_widget (GtkWidget *window,
- StockPixmap icon);
-gint stock_pixbuf_gdk (GtkWidget *window, StockPixmap icon,
- GdkPixbuf **pixbuf);
+GtkWidget *stock_pixmap_widget (StockPixmap icon);
+gint stock_pixbuf_gdk (StockPixmap icon, GdkPixbuf **pixbuf);
GList *stock_pixmap_themes_list_new (void);
void stock_pixmap_themes_list_free (GList *list);
gchar *stock_pixmap_get_name (StockPixmap icon);
StockPixmap stock_pixmap_get_icon (gchar *file);
-GtkWidget *stock_pixmap_widget_with_overlay (GtkWidget *window,
- StockPixmap icon,
+GtkWidget *stock_pixmap_widget_with_overlay (StockPixmap icon,
StockPixmap overlay,
OverlayPosition pos,
gint border_x,
diff --git a/src/summaryview.c b/src/summaryview.c
index 4a519df..7abda57 100644
--- a/src/summaryview.c
+++ b/src/summaryview.c
@@ -921,7 +921,7 @@ static void summary_set_folder_pixmap(SummaryView *summaryview, StockPixmap icon
if (summaryview->folder_pixmap)
gtk_widget_destroy(summaryview->folder_pixmap);
- pixmap = stock_pixmap_widget(summaryview->hbox_l, icon);
+ pixmap = stock_pixmap_widget(icon);
gtk_container_add(GTK_CONTAINER(summaryview->folder_pixmap_eventbox), pixmap);
gtk_widget_show(pixmap);
summaryview->folder_pixmap = pixmap;
@@ -932,56 +932,37 @@ void summary_init(SummaryView *summaryview)
GtkWidget *pixmap;
gtk_widget_realize(summaryview->ctree);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_MARK,
- &markxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_DELETED,
- &deletedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_NEW,
- &newxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_UNREAD,
- &unreadxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED,
- &repliedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_FORWARDED,
- &forwardedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED,
- &repliedandforwardedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP,
- &clipxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_LOCKED,
- &lockedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_IGNORETHREAD,
- &ignorethreadxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_WATCHTHREAD,
- &watchthreadxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_KEY,
- &clipkeyxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_KEY_SIGN,
- &keysignxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_KEY,
- &keyxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_GPG_SIGNED,
- &gpgsignedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED,
- &clipgpgsignedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_SPAM,
- &spamxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_MOVED,
- &movedxpm);
- stock_pixbuf_gdk(summaryview->ctree, STOCK_PIXMAP_COPIED,
- &copiedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MARK, &markxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DELETED, &deletedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_NEW, &newxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_UNREAD, &unreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED, &repliedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_FORWARDED, &forwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP, &clipxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_LOCKED, &lockedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY_SIGN, &keysignxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY, &keyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_SPAM, &spamxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MOVED, &movedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_COPIED, &copiedxpm);
summary_set_fonts(summaryview);
summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_QUICKSEARCH);
gtk_container_add (GTK_CONTAINER(summaryview->toggle_search), pixmap);
gtk_widget_show(pixmap);
summaryview->quick_search_pixmap = pixmap;
#ifdef GENERIC_UMPC
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_SELECTION);
gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
gtk_widget_show(pixmap);
summaryview->multiple_sel_image = pixmap;
@@ -7867,32 +7848,31 @@ static void summary_set_hide_menu (SummaryView *summaryview,
void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
{
- GtkWidget *ctree = summaryview->ctree;
GtkWidget *pixmap;
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_MARK, &markxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_DELETED, &deletedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_NEW, &newxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_UNREAD, &unreadxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED, &repliedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_FORWARDED, &forwardedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP, &clipxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_LOCKED, &lockedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_KEY, &keyxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_KEY_SIGN, &keysignxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_SPAM, &spamxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_MOVED, &movedxpm);
- stock_pixbuf_gdk(ctree, STOCK_PIXMAP_COPIED, &copiedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MARK, &markxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_DELETED, &deletedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_NEW, &newxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_UNREAD, &unreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED, &repliedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_FORWARDED, &forwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_REPLIED_AND_FORWARDED, &repliedandforwardedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP, &clipxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_LOCKED, &lockedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_IGNORETHREAD, &ignorethreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_WATCHTHREAD, &watchthreadxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_KEY, &clipkeyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY, &keyxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_KEY_SIGN, &keysignxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_GPG_SIGNED, &gpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_CLIP_GPG_SIGNED, &clipgpgsignedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_SPAM, &spamxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_MOVED, &movedxpm);
+ stock_pixbuf_gdk(STOCK_PIXMAP_COPIED, &copiedxpm);
summary_set_folder_pixmap(summaryview, STOCK_PIXMAP_DIR_OPEN);
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_QUICKSEARCH);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_QUICKSEARCH);
gtk_container_remove (GTK_CONTAINER(summaryview->toggle_search),
summaryview->quick_search_pixmap);
gtk_container_add(GTK_CONTAINER(summaryview->toggle_search), pixmap);
@@ -7900,7 +7880,7 @@ void summary_reflect_prefs_pixmap_theme(SummaryView *summaryview)
summaryview->quick_search_pixmap = pixmap;
#ifdef GENERIC_UMPC
- pixmap = stock_pixmap_widget(summaryview->hbox, STOCK_PIXMAP_SELECTION);
+ pixmap = stock_pixmap_widget(STOCK_PIXMAP_SELECTION);
gtk_container_remove (GTK_CONTAINER(summaryview->multiple_sel_togbtn),
summaryview->multiple_sel_image);
gtk_container_add(GTK_CONTAINER(summaryview->multiple_sel_togbtn), pixmap);
diff --git a/src/toolbar.c b/src/toolbar.c
index e7a553e..697c2f9 100644
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -1917,7 +1917,7 @@ Toolbar *toolbar_create(ToolbarType type,
toolbar_data->item_list =
g_slist_append(toolbar_data->item_list,
toolbar_item);
- icon_wid = stock_pixmap_widget(container, stock_pixmap_get_icon(toolbar_item->file));
+ icon_wid = stock_pixmap_widget(stock_pixmap_get_icon(toolbar_item->file));
switch (toolbar_item->index) {
@@ -1960,7 +1960,7 @@ Toolbar *toolbar_create(ToolbarType type,
toolbar_data->compose_mail_icon = icon_wid;
g_object_ref(toolbar_data->compose_mail_icon);
- icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+ icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
toolbar_data->compose_news_icon = icon_news;
g_object_ref(toolbar_data->compose_news_icon);
#else
@@ -1969,7 +1969,7 @@ Toolbar *toolbar_create(ToolbarType type,
toolbar_data->compose_mail_btn = item;
toolbar_data->compose_mail_icon = icon_wid;
- icon_news = stock_pixmap_widget(container, STOCK_PIXMAP_NEWS_COMPOSE);
+ icon_news = stock_pixmap_widget(STOCK_PIXMAP_NEWS_COMPOSE);
toolbar_data->compose_news_icon = icon_news;
#endif
break;
@@ -1981,7 +1981,7 @@ Toolbar *toolbar_create(ToolbarType type,
toolbar_data->learn_spam_icon = icon_wid;
g_object_ref(toolbar_data->learn_spam_icon);
- icon_ham = stock_pixmap_widget(container, STOCK_PIXMAP_HAM_BTN);
+ icon_ham = stock_pixmap_widget(STOCK_PIXMAP_HAM_BTN);
toolbar_data->learn_ham_icon = icon_ham;
g_object_ref(toolbar_data->learn_ham_icon);
diff --git a/src/wizard.c b/src/wizard.c
index 6517b31..81ef196 100644
--- a/src/wizard.c
+++ b/src/wizard.c
@@ -848,8 +848,7 @@ static GtkWidget* create_page (WizardWindow *wizard, const char * title)
/* create the titlebar */
hbox = gtk_hbox_new (FALSE, 12);
- image = stock_pixmap_widget(wizard->window,
- STOCK_PIXMAP_CLAWS_MAIL_ICON);
+ image = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_ICON);
gtk_box_pack_start (GTK_BOX(hbox), image, FALSE, FALSE, 0);
title_string = g_strconcat ("<span size=\"xx-large\" weight=\"ultrabold\">", title ? title : "", "</span>", NULL);
w = gtk_label_new (title_string);
@@ -1823,8 +1822,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
page = create_page(wizard, _("Welcome to Claws Mail"));
wizard->pages = g_slist_append(wizard->pages, page);
- widget = stock_pixmap_widget(wizard->window,
- STOCK_PIXMAP_CLAWS_MAIL_LOGO);
+ widget = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_LOGO);
gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
@@ -1906,8 +1904,7 @@ gboolean run_wizard(MainWindow *mainwin, gboolean create_mailbox) {
page = create_page(wizard, _("Configuration finished"));
wizard->pages = g_slist_append(wizard->pages, page);
- widget = stock_pixmap_widget(wizard->window,
- STOCK_PIXMAP_CLAWS_MAIL_LOGO);
+ widget = stock_pixmap_widget(STOCK_PIXMAP_CLAWS_MAIL_LOGO);
gtk_box_pack_start (GTK_BOX(page), widget, FALSE, FALSE, 0);
-----------------------------------------------------------------------
hooks/post-receive
--
Claws Mail
More information about the Commits
mailing list