aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRob Bradford <rob@linux.intel.com>2010-08-02 02:29:56 +0800
committerRob Bradford <rob@linux.intel.com>2010-08-02 17:58:43 +0800
commitb6b72b0c4a269333d5375e864a82e6b9588ffd07 (patch)
tree15c83485b645c54305135c34a6a30754469e718a
parent131c0ddfe3f5b6a96fffe99a6692e38f886f122b (diff)
downloadgsoc2013-evolution-b6b72b0c4a269333d5375e864a82e6b9588ffd07.tar
gsoc2013-evolution-b6b72b0c4a269333d5375e864a82e6b9588ffd07.tar.gz
gsoc2013-evolution-b6b72b0c4a269333d5375e864a82e6b9588ffd07.tar.bz2
gsoc2013-evolution-b6b72b0c4a269333d5375e864a82e6b9588ffd07.tar.lz
gsoc2013-evolution-b6b72b0c4a269333d5375e864a82e6b9588ffd07.tar.xz
gsoc2013-evolution-b6b72b0c4a269333d5375e864a82e6b9588ffd07.tar.zst
gsoc2013-evolution-b6b72b0c4a269333d5375e864a82e6b9588ffd07.zip
addressbook/gui, plugins/groupwise, widgets/misc: Update to new icon theme
Since gnome-icon-theme 2.30.x the icon name for the default avatar has changed from stock_person to avatar-default Fixes: https://bugzilla.gnome.org/show_bug.cgi?id=616822
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c6
-rw-r--r--addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui2
-rw-r--r--addressbook/gui/merging/eab-contact-duplicate-detected.ui2
-rw-r--r--plugins/groupwise-features/proxy-login.c2
-rw-r--r--plugins/groupwise-features/proxy.c2
-rw-r--r--widgets/misc/e-image-chooser.c2
6 files changed, 8 insertions, 8 deletions
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index 6ce890c999..9700cf9cf8 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -2338,7 +2338,7 @@ fill_in_simple_field (EContactEditor *editor, GtkWidget *widget, gint field_id)
editor->image_set = TRUE;
}
else {
- gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG);
+ gchar *file_name = e_icon_factory_get_icon_filename ("avatar-default", GTK_ICON_SIZE_DIALOG);
e_image_chooser_set_from_file (E_IMAGE_CHOOSER (widget), file_name);
editor->image_set = FALSE;
g_free (file_name);
@@ -2921,7 +2921,7 @@ image_cleared (EContactEditor *editor)
image_chooser = e_builder_get_widget (editor->builder, "image-chooser");
- file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG);
+ file_name = e_icon_factory_get_icon_filename ("avatar-default", GTK_ICON_SIZE_DIALOG);
g_signal_handlers_block_by_func (image_chooser, image_chooser_changed, editor);
e_image_chooser_set_from_file (E_IMAGE_CHOOSER (image_chooser), file_name);
@@ -2968,7 +2968,7 @@ update_preview_cb (GtkFileChooser *file_chooser, gpointer data)
pixbuf = gdk_pixbuf_new_from_file_at_size (filename, 128, 128, NULL);
if (!pixbuf) {
gchar *alternate_file;
- alternate_file = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG);
+ alternate_file = e_icon_factory_get_icon_filename ("avatar-default", GTK_ICON_SIZE_DIALOG);
if (alternate_file) {
pixbuf = gdk_pixbuf_new_from_file_at_size (alternate_file, 128, 128, NULL);
g_free (alternate_file);
diff --git a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
index c12a39ec03..4ee84acbf1 100644
--- a/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
+++ b/addressbook/gui/merging/eab-contact-commit-duplicate-detected.ui
@@ -156,7 +156,7 @@
<child>
<object class="GtkImage" id="custom2">
<property name="visible">True</property>
- <property name="icon-name">stock_person</property>
+ <property name="icon-name">avatar-default</property>
</object>
</child>
</object>
diff --git a/addressbook/gui/merging/eab-contact-duplicate-detected.ui b/addressbook/gui/merging/eab-contact-duplicate-detected.ui
index 00ae19fc91..38d8f0e1d8 100644
--- a/addressbook/gui/merging/eab-contact-duplicate-detected.ui
+++ b/addressbook/gui/merging/eab-contact-duplicate-detected.ui
@@ -190,7 +190,7 @@ in this folder. Would you like to add it anyway?</property>
<child>
<object class="GtkImage" id="custom2">
<property name="visible">True</property>
- <property name="icon-name">stock_person</property>
+ <property name="icon-name">avatar-default</property>
</object>
</child>
</object>
diff --git a/plugins/groupwise-features/proxy-login.c b/plugins/groupwise-features/proxy-login.c
index 41c9a91beb..25518ba9a7 100644
--- a/plugins/groupwise-features/proxy-login.c
+++ b/plugins/groupwise-features/proxy-login.c
@@ -450,7 +450,7 @@ proxy_login_update_tree (void)
gchar *proxy_email;
EGwConnection *cnc;
proxyLoginPrivate *priv = pld->priv;
- gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG);
+ gchar *file_name = e_icon_factory_get_icon_filename ("avatar-default", GTK_ICON_SIZE_DIALOG);
broken_image = file_name ? gdk_pixbuf_new_from_file (file_name, NULL) : NULL;
cnc = proxy_login_get_cnc (pld->account, priv->main ? (GTK_WINDOW (gtk_widget_get_toplevel (priv->main))) : NULL);
diff --git a/plugins/groupwise-features/proxy.c b/plugins/groupwise-features/proxy.c
index d8471ab050..7b3cae23a8 100644
--- a/plugins/groupwise-features/proxy.c
+++ b/plugins/groupwise-features/proxy.c
@@ -606,7 +606,7 @@ proxy_update_tree_view (EAccount *account)
GdkPixbuf *broken_image = NULL;
GList *list_iter;
proxyHandler *aclInstance;
- gchar *file_name = e_icon_factory_get_icon_filename ("stock_person", GTK_ICON_SIZE_DIALOG);
+ gchar *file_name = e_icon_factory_get_icon_filename ("avatar-default", GTK_ICON_SIZE_DIALOG);
proxyDialogPrivate *priv;
prd = g_object_get_data ((GObject *)account, "prd");
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index e4474135f8..ed0a9e2327 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -422,7 +422,7 @@ e_image_chooser_class_init (EImageChooserClass *class)
"icon-name",
"Icon Name",
NULL,
- "stock_person",
+ "avatar-default",
G_PARAM_READWRITE |
G_PARAM_CONSTRUCT_ONLY));