aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-09-01 22:57:02 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-09-01 22:57:02 +0800
commita8cff3a02a1aecdea2e4fecfa37dca809a176ec2 (patch)
tree096fd82b35851668fae9e032927502c19b10b6fa /plugins
parent65edf39de973207ca62acbcc7887eb2dce614537 (diff)
downloadgsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar
gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.gz
gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.bz2
gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.lz
gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.xz
gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.tar.zst
gsoc2013-evolution-a8cff3a02a1aecdea2e4fecfa37dca809a176ec2.zip
Fix compiler warnings in some of the test programs.
2008-09-01 Matthew Barnes <mbarnes@redhat.com> * configure.in: Fix compiler warnings in some of the test programs. * mail/em-composer-utils.c (edit_message): * plugins/email-custom-header/email-custom-header.c: * plugins/templates/templates.c: Don't mix declarations and code. svn path=/trunk/; revision=36242
Diffstat (limited to 'plugins')
-rw-r--r--plugins/email-custom-header/ChangeLog5
-rw-r--r--plugins/email-custom-header/email-custom-header.c5
-rw-r--r--plugins/templates/ChangeLog5
-rw-r--r--plugins/templates/templates.c2
4 files changed, 14 insertions, 3 deletions
diff --git a/plugins/email-custom-header/ChangeLog b/plugins/email-custom-header/ChangeLog
index 2c992a4fac..f69ba35622 100644
--- a/plugins/email-custom-header/ChangeLog
+++ b/plugins/email-custom-header/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01 Matthew Barnes <mbarnes@redhat.com>
+
+ * email-custom-header.c:
+ Don't mix declarations and code.
+
2008-08-14 Matthew Barnes <mbarnes@redhat.com>
* gui/contact-editor/e-contact-editor.c:
diff --git a/plugins/email-custom-header/email-custom-header.c b/plugins/email-custom-header/email-custom-header.c
index ab882cc197..847c56d315 100644
--- a/plugins/email-custom-header/email-custom-header.c
+++ b/plugins/email-custom-header/email-custom-header.c
@@ -651,13 +651,13 @@ header_foreach_check_isempty (GtkTreeModel *model, GtkTreePath *path, GtkTreeIte
valid = gtk_tree_model_get_iter_first (model, iter);
while (valid && gtk_list_store_iter_is_valid (cd->store, iter)) {
char *keyword = NULL;
+ char *value = NULL;
gtk_tree_model_get (model, iter, HEADER_KEY_COLUMN, &keyword, -1);
/* Check if the keyword is not empty and then emit the row-changed
signal (if we delete the row, then the iter gets corrupted) */
if ((keyword) && !(g_utf8_strlen (g_strstrip (keyword), -1) > 0))
gtk_tree_model_row_changed (model, path, iter);
- char *value = NULL;
gtk_tree_model_get (model, iter, HEADER_VALUE_COLUMN, &value, -1);
/* Check if the keyword is not empty and then emit the row-changed
signal (if we delete the row, then the iter gets corrupted) */
@@ -919,9 +919,10 @@ e_plugin_lib_get_configure_widget (EPlugin *epl)
header_list = gconf_client_get_list (client,GCONF_KEY_CUSTOM_HEADER,GCONF_VALUE_STRING, NULL);
for (list = header_list; list; list = g_slist_next (list)) {
- gtk_list_store_append (cd->store, &iter);
gchar **parse_header_list;
+
buffer = list->data;
+ gtk_list_store_append (cd->store, &iter);
parse_header_list = g_strsplit_set (buffer, "=,", -1);
str_colon = g_strconcat (parse_header_list[0], "", NULL);
gtk_list_store_set (cd->store, &iter, HEADER_KEY_COLUMN, str_colon, -1);
diff --git a/plugins/templates/ChangeLog b/plugins/templates/ChangeLog
index e1157ef1d9..04e998ef82 100644
--- a/plugins/templates/ChangeLog
+++ b/plugins/templates/ChangeLog
@@ -1,3 +1,8 @@
+2008-09-01 Matthew Barnes <mbarnes@redhat.com>
+
+ * templates.c:
+ Don't mix declarations and code.
+
2008-08-12 Bharath Acharya <abharath@novell.com>
* Makefile.am: Have a check for OS_WIN32 and handle the schema data
diff --git a/plugins/templates/templates.c b/plugins/templates/templates.c
index c72ae942a9..bb5630fc5d 100644
--- a/plugins/templates/templates.c
+++ b/plugins/templates/templates.c
@@ -586,6 +586,7 @@ static GSList
char *path;
EPopupItem *item;
CamelMimeMessage *message;
+ UserData *user_data;
const char *uid;
uid = g_strdup (g_ptr_array_index (uids, i));
@@ -615,7 +616,6 @@ static GSList
item->visible = EM_POPUP_SELECT_MANY | EM_POPUP_SELECT_ONE;
/* Make some info available to the callback */
- UserData *user_data;
user_data = g_slice_new(UserData);
user_data->msg = message;
user_data->t = t;