callisto-debian/evolution
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compiler warnings in some of the test programs.

Browse Source 
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
This commit is contained in:
Matthew Barnes
2008-09-01 14:57:02 +00:00
committed by Matthew Barnes
parent 65edf39de9
commit a8cff3a02a
8 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
2008-09-01 Matthew Barnes <mbarnes@redhat.com>
* configure.in:
Fix compiler warnings in some of the test programs.
2008-08-20 Matthew Barnes <mbarnes@redhat.com>
** Fixes part of bug #546926

4
configure.in
View File

@ -259,8 +259,8 @@ if test $have_iconv = yes; then
int main (int argc, char **argv)
{
const char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";
const char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";
char *jp = "\x1B\x24\x42\x46\x7C\x4B\x5C\x38\x6C";
char *utf8 = "\xE6\x97\xA5\xE6\x9C\xAC\xE8\xAA\x9E";
char *transbuf = malloc (10), *trans = transbuf;
iconv_t cd;
size_t jp_len = strlen (jp), utf8_len = 10;

5
mail/ChangeLog
View File

@ -1,3 +1,8 @@
2008-09-01 Matthew Barnes <mbarnes@redhat.com>
* em-composer-utils.c (edit_message):
Don't mix declarations and code.
2008-09-01 Milan Crha <mcrha@redhat.com>
** Fix for bug #543135

8
mail/em-composer-utils.c
View File

@ -822,6 +822,8 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
CamelStream *stream;
CamelMimePart *part;
int count1 = 0, string_changed = 0;
const char *cur;
int i;
char *str;
gint count = 2;
@ -853,14 +855,14 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
str = g_strndup ((const gchar*)((CamelStreamMem *) mem)->buffer->data, ((CamelStreamMem *) mem)->buffer->len);
camel_object_unref (mem);
const char *cur = str;
int i;
cur = str;
for (i = 0; i < strlen(str); i++) {
if (!g_ascii_strncasecmp (cur, "$", 1)) {
const char *end = cur, *check_env;
char *out;
GConfClient *gconf;
GSList *clue_list = NULL, *list;
char **temp_str;
gconf = gconf_client_get_default ();
@ -870,7 +872,7 @@ edit_message (CamelMimeMessage *message, CamelFolder *drafts, const char *uid)
out = g_strndup ((const gchar *) cur, end - cur);
check_env = out;
char **temp_str = g_strsplit (str, out, 2);
temp_str = g_strsplit (str, out, 2);
/* Get the list from gconf */
clue_list = gconf_client_get_list ( gconf, GCONF_KEY_TEMPLATE_PLACEHOLDERS, GCONF_VALUE_STRING, NULL );

5
plugins/email-custom-header/ChangeLog
View File

@ -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:

5
plugins/email-custom-header/email-custom-header.c
View File

@ -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);

5
plugins/templates/ChangeLog
View File

@ -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

2
plugins/templates/templates.c
View File

@ -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;