From d92cfbebd8d52cfeeb3133ab30f0e1c56ce41ed5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dan=20Vr=C3=A1til?= Date: Wed, 2 Feb 2011 17:07:07 -0500 Subject: 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. --- plugins/face/face.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) (limited to 'plugins/face/face.c') 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 -#include +#include #include #include #include @@ -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; -- cgit v1.2.3 From 3b6c8972a51d635309b789b1aef9034ca23dc737 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 18 Feb 2011 19:35:59 -0500 Subject: Coding style and whitespace cleanup. --- plugins/face/face.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/face/face.c') diff --git a/plugins/face/face.c b/plugins/face/face.c index 576a5acfb8..8f50f16d68 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -365,7 +365,7 @@ get_cfg_widget (void) gtk_box_pack_start (GTK_BOX (vbox), butt, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX (vbox), img, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (vbox), img, FALSE, FALSE, 0); gtk_widget_show_all (vbox); -- cgit v1.2.3 From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- plugins/face/face.c | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) (limited to 'plugins/face/face.c') diff --git a/plugins/face/face.c b/plugins/face/face.c index 8f50f16d68..df9eafcd5a 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -90,7 +90,8 @@ get_face_base64 (void) } static void -set_face_raw (gchar *content, gsize length) +set_face_raw (gchar *content, + gsize length) { gchar *filename = get_filename (); @@ -150,7 +151,11 @@ get_active_face (void) } static gboolean -prepare_image (const gchar *image_filename, gchar **file_contents, gsize *length, GdkPixbuf **use_pixbuf, gboolean can_claim) +prepare_image (const gchar *image_filename, + gchar **file_contents, + gsize *length, + GdkPixbuf **use_pixbuf, + gboolean can_claim) { gboolean res = FALSE; @@ -249,7 +254,8 @@ prepare_image (const gchar *image_filename, gchar **file_contents, gsize *length } static void -update_preview_cb (GtkFileChooser *file_chooser, gpointer data) +update_preview_cb (GtkFileChooser *file_chooser, + gpointer data) { GtkWidget *preview; gchar *filename, *file_contents = NULL; @@ -322,7 +328,8 @@ choose_new_face (void) } static void -toggled_check_include_by_default_cb (GtkWidget *widget, gpointer data) +toggled_check_include_by_default_cb (GtkWidget *widget, + gpointer data) { set_include_face_by_default (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget))); } @@ -373,7 +380,8 @@ get_cfg_widget (void) } static void -action_toggle_face_cb (GtkToggleAction *action, EMsgComposer *composer) +action_toggle_face_cb (GtkToggleAction *action, + EMsgComposer *composer) { if (gtk_toggle_action_get_active (action)) { gchar *face = get_face_base64 (); @@ -403,14 +411,15 @@ void face_handle_send (EPlugin *ep, EMEventTargetComposer *target); /* ----------------------------------------------------------------- */ gint -e_plugin_lib_enable (EPlugin *ep, gint enable) +e_plugin_lib_enable (EPlugin *ep, + gint enable) { return 0; } gboolean e_plugin_ui_init (GtkUIManager *ui_manager, - EMsgComposer *composer) + EMsgComposer *composer) { GtkhtmlEditor *editor; @@ -450,7 +459,8 @@ e_plugin_lib_get_configure_widget (EPlugin *epl) } void -face_handle_send (EPlugin *ep, EMEventTargetComposer *target) +face_handle_send (EPlugin *ep, + EMEventTargetComposer *target) { GtkhtmlEditor *editor; GtkAction *action; -- cgit v1.2.3 From 22eeb9e05d9a01f1686e40cd60f8f7907385c9be Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Wed, 2 Nov 2011 14:59:25 +0100 Subject: Migrate face plugin to GSettings --- plugins/face/face.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'plugins/face/face.c') diff --git a/plugins/face/face.c b/plugins/face/face.c index df9eafcd5a..d344548e45 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -35,17 +35,17 @@ #define d(x) -#define SETTINGS_KEY "/apps/evolution/eplugin/face/insert_by_default" +#define SETTINGS_KEY "insert-face-picture" static gboolean get_include_face_by_default (void) { - GConfClient *gconf = gconf_client_get_default (); + GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture"); gboolean res; - res = gconf_client_get_bool (gconf, SETTINGS_KEY, NULL); + res = g_settings_get_boolean (settings, SETTINGS_KEY); - g_object_unref (gconf); + g_object_unref (settings); return res; } @@ -53,11 +53,11 @@ get_include_face_by_default (void) static void set_include_face_by_default (gboolean value) { - GConfClient *gconf = gconf_client_get_default (); + GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture"); - gconf_client_set_bool (gconf, SETTINGS_KEY, value, NULL); + g_settings_set_boolean (settings, SETTINGS_KEY, value); - g_object_unref (gconf); + g_object_unref (settings); } static gchar * -- cgit v1.2.3 From 2e60b6a4a21105bb4a1e2badd1be51b3e684d165 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 22 Nov 2011 17:53:07 -0500 Subject: Tweak GSettings schemas. - Don't use the term "eplugin" for modules. - Use the term "plugin" instead of "eplugin" for plugins. - Split SpamAssassin settings into a separate schema. --- plugins/face/face.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'plugins/face/face.c') diff --git a/plugins/face/face.c b/plugins/face/face.c index d344548e45..18a1a2d978 100644 --- a/plugins/face/face.c +++ b/plugins/face/face.c @@ -40,7 +40,7 @@ static gboolean get_include_face_by_default (void) { - GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture"); + GSettings *settings = g_settings_new ("org.gnome.evolution.plugin.face-picture"); gboolean res; res = g_settings_get_boolean (settings, SETTINGS_KEY); @@ -53,7 +53,7 @@ get_include_face_by_default (void) static void set_include_face_by_default (gboolean value) { - GSettings *settings = g_settings_new ("org.gnome.evolution.eplugin.face-picture"); + GSettings *settings = g_settings_new ("org.gnome.evolution.plugin.face-picture"); g_settings_set_boolean (settings, SETTINGS_KEY, value); -- cgit v1.2.3