aboutsummaryrefslogtreecommitdiffstats
path: root/mail
diff options
context:
space:
mode:
authorSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-02 12:45:41 +0800
committerSrinivasa Ragavan <sragavan@src.gnome.org>2006-08-02 12:45:41 +0800
commit10fee962a6d96ca6e091c62dccdef14aeb428314 (patch)
tree56c53d14659dc2004e1169441feb3b1b2c8ebd65 /mail
parent1f81685b9cb42ded20d0b6560e5071902afe4756 (diff)
downloadgsoc2013-evolution-10fee962a6d96ca6e091c62dccdef14aeb428314.tar
gsoc2013-evolution-10fee962a6d96ca6e091c62dccdef14aeb428314.tar.gz
gsoc2013-evolution-10fee962a6d96ca6e091c62dccdef14aeb428314.tar.bz2
gsoc2013-evolution-10fee962a6d96ca6e091c62dccdef14aeb428314.tar.lz
gsoc2013-evolution-10fee962a6d96ca6e091c62dccdef14aeb428314.tar.xz
gsoc2013-evolution-10fee962a6d96ca6e091c62dccdef14aeb428314.tar.zst
gsoc2013-evolution-10fee962a6d96ca6e091c62dccdef14aeb428314.zip
Fix for bug #348164
svn path=/trunk/; revision=32458
Diffstat (limited to 'mail')
-rw-r--r--mail/ChangeLog11
-rw-r--r--mail/em-folder-browser.c8
-rw-r--r--mail/mail-component.c4
3 files changed, 17 insertions, 6 deletions
diff --git a/mail/ChangeLog b/mail/ChangeLog
index 6384a5ed72..23e03f22bc 100644
--- a/mail/ChangeLog
+++ b/mail/ChangeLog
@@ -1,3 +1,14 @@
+2006-07-26 Alessandro Decina <alessandro@nnva.org>
+
+ ** Fix for bug #348164
+
+ * em-folder-browser.c: (emfb_class_init):
+ Remove the unused G_TYPE_STRING parameter from the
+ account_search_activated and account_search_cleared signals.
+
+ * mail-component.c: (disable_folder_tree), (enable_folder_tree):
+ Update the callbacks to match the new signature.
+
2006-07-28 Sankar P <psankar@novell.com>
* committed on behalf of Srinivasa Ragavan <sragavan@novell.com>
diff --git a/mail/em-folder-browser.c b/mail/em-folder-browser.c
index a94aa39d04..06117538c5 100644
--- a/mail/em-folder-browser.c
+++ b/mail/em-folder-browser.c
@@ -501,8 +501,8 @@ emfb_class_init(GObjectClass *klass)
G_STRUCT_OFFSET (EMFolderBrowserClass, account_search_activated),
NULL,
NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
folder_browser_signals[ACCOUNT_SEARCH_CLEARED] =
g_signal_new ("account_search_cleared",
@@ -511,8 +511,8 @@ emfb_class_init(GObjectClass *klass)
G_STRUCT_OFFSET (EMFolderBrowserClass, account_search_cleared),
NULL,
NULL,
- g_cclosure_marshal_VOID__STRING,
- G_TYPE_NONE, 1, G_TYPE_STRING);
+ g_cclosure_marshal_VOID__VOID,
+ G_TYPE_NONE, 0);
((GtkObjectClass *)klass)->destroy = emfb_destroy;
diff --git a/mail/mail-component.c b/mail/mail-component.c
index 1318db581f..18d05c4cae 100644
--- a/mail/mail-component.c
+++ b/mail/mail-component.c
@@ -619,13 +619,13 @@ view_changed_cb(EMFolderView *emfv, EComponentView *component_view)
}
static void
-disable_folder_tree (gpointer *emfb, gpointer dummy, GtkWidget *widget)
+disable_folder_tree (gpointer *emfb, GtkWidget *widget)
{
gtk_widget_set_sensitive (widget, FALSE);
}
static void
-enable_folder_tree (GtkWidget *emfb, gpointer dum, GtkWidget *emft)
+enable_folder_tree (GtkWidget *emfb, GtkWidget *emft)
{
char *uri;
CamelURL *selected_curl, *current_curl;