aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorDan Vrátil <dvratil@redhat.com>2011-02-03 06:07:07 +0800
committerMatthew Barnes <mbarnes@redhat.com>2011-02-03 06:21:24 +0800
commitc49e3012a029bb78dc759a9fc8dfc1103a36d976 (patch)
tree3d798afc87ff5a5ec1fecdb879ca726ba8467c66 /plugins
parenta2338f63a6f92a7795bf57e52864d2486e0105e0 (diff)
downloadgsoc2013-evolution-c49e3012a029bb78dc759a9fc8dfc1103a36d976.tar
gsoc2013-evolution-c49e3012a029bb78dc759a9fc8dfc1103a36d976.tar.gz
gsoc2013-evolution-c49e3012a029bb78dc759a9fc8dfc1103a36d976.tar.bz2
gsoc2013-evolution-c49e3012a029bb78dc759a9fc8dfc1103a36d976.tar.lz
gsoc2013-evolution-c49e3012a029bb78dc759a9fc8dfc1103a36d976.tar.xz
gsoc2013-evolution-c49e3012a029bb78dc759a9fc8dfc1103a36d976.tar.zst
gsoc2013-evolution-c49e3012a029bb78dc759a9fc8dfc1103a36d976.zip
Bug 222423 - Support Face headers
The configuration section for the Face plugin now has a preview image. Also promoting this plugin out of "experimental" status so more distros will pick it up.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/face/face.c20
1 files changed, 9 insertions, 11 deletions
diff --git a/plugins/face/face.c b/plugins/face/face.c
index 57e80832e6..576a5acfb8 100644
--- a/plugins/face/face.c
+++ b/plugins/face/face.c
@@ -27,7 +27,7 @@
#include "composer/e-msg-composer.h"
#include <gtk/gtk.h>
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
#include <mail/em-event.h>
#include <e-util/e-alert-dialog.h>
#include <e-util/e-util.h>
@@ -282,8 +282,8 @@ choose_new_face (void)
GtkWidget *filesel, *preview;
GtkFileFilter *filter;
- filesel = gtk_file_chooser_dialog_new (_
- ("Select a png picture (the best 48*48 of size < 720 bytes)"),
+ filesel = gtk_file_chooser_dialog_new (
+ _("Select a Face Picture"),
NULL,
GTK_FILE_CHOOSER_ACTION_OPEN,
GTK_STOCK_CANCEL,
@@ -328,18 +328,15 @@ toggled_check_include_by_default_cb (GtkWidget *widget, gpointer data)
}
static void
-click_load_face_cb (GtkButton *butt, gpointer data)
+click_load_face_cb (GtkButton *butt,
+ GtkImage *image)
{
GdkPixbuf *face;
- GtkWidget *img;
-
- img = gtk_button_get_image (butt);
- g_return_if_fail (img != NULL);
face = choose_new_face ();
if (face) {
- gtk_image_set_from_pixbuf (GTK_IMAGE (img), face);
+ gtk_image_set_from_pixbuf (image, face);
g_object_unref (face);
}
}
@@ -364,11 +361,12 @@ get_cfg_widget (void)
g_object_unref (face);
butt = gtk_button_new_with_mnemonic (_("Load new _Face picture"));
- gtk_button_set_image (GTK_BUTTON (butt), img);
- g_signal_connect (butt, "clicked", G_CALLBACK (click_load_face_cb), NULL);
+ g_signal_connect (butt, "clicked", G_CALLBACK (click_load_face_cb), img);
gtk_box_pack_start (GTK_BOX (vbox), butt, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX (vbox), img, FALSE, FALSE, 0);
+
gtk_widget_show_all (vbox);
return vbox;