diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2008-09-11 23:34:29 +0800 |
| commit | c0a255eb90769638d57ae4122932f75c46e4e531 (patch) | |
| tree | 5213694107a246763c25c0a089553dd7c8708b32 /plugins/templates | |
| parent | 4c8aa5982c0132716f473873d0e1d7601df14607 (diff) | |
| download | gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.gz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.bz2 gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.lz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.xz gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.tar.zst gsoc2013-evolution-c0a255eb90769638d57ae4122932f75c46e4e531.zip | |
Merge revisions 36016:36303 from trunk.
svn path=/branches/kill-bonobo/; revision=36307
Diffstat (limited to 'plugins/templates')
| -rw-r--r-- | plugins/templates/ChangeLog | 5 | ||||
| -rw-r--r-- | plugins/templates/templates.c | 2 |
2 files changed, 6 insertions, 1 deletions
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; |