aboutsummaryrefslogtreecommitdiffstats
path: root/shell
diff options
context:
space:
mode:
authorChris Toshok <toshok@ximian.com>2002-11-20 16:41:11 +0800
committerChris Toshok <toshok@src.gnome.org>2002-11-20 16:41:11 +0800
commit69dd24294f4e45d278ae6ef34ae19c1fda5dc1b7 (patch)
tree38f6d2a51ae75b108fa81c9dac865719207907fb /shell
parent3d98eeac31a4ff23c22c6ab0350fb0ba80725032 (diff)
downloadgsoc2013-evolution-69dd24294f4e45d278ae6ef34ae19c1fda5dc1b7.tar.gz
gsoc2013-evolution-69dd24294f4e45d278ae6ef34ae19c1fda5dc1b7.tar.zst
gsoc2013-evolution-69dd24294f4e45d278ae6ef34ae19c1fda5dc1b7.zip
use e_shell_ marshallers, and make sure STRING parameters map to *_STRING*
2002-11-20 Chris Toshok <toshok@ximian.com> * e-folder-list.c (e_folder_list_class_init): use e_shell_ marshallers, and make sure STRING parameters map to *_STRING* marshallers. * evolution-wizard.c (evolution_wizard_class_init): same. * evolution-storage.c (class_init): same. * evolution-storage-set-view-listener.c (class_init): same. * evolution-storage-listener.c (class_init): same. * evolution-shell-view.c (class_init): same. * evolution-session.c (class_init): same. * evolution-folder-selector-button.c (class_init): same. * evolution-config-control.c (class_init): same. * evolution-activity-client.c (class_init): same. * e-storage-set.c (class_init): same. * e-shortcuts.c (class_init): same. * e-shortcuts-view.c (class_init): same. * e-shell.c (class_init): same. * e-shell-view.c (class_init): same. * e-shell-offline-handler.c (class_init): same. * e-shell-folder-title-bar.c (class_init): same. * e-shell-folder-selection-dialog.c (class_init): same. * e-folder.c (class_init): same. * e-shell-marshal.list: add all the STRING marshallers. svn path=/trunk/; revision=18857
Diffstat (limited to 'shell')
-rw-r--r--shell/ChangeLog44
-rw-r--r--shell/e-folder-list.c5
-rw-r--r--shell/e-folder.c5
-rw-r--r--shell/e-shell-folder-selection-dialog.c5
-rw-r--r--shell/e-shell-folder-title-bar.c7
-rw-r--r--shell/e-shell-marshal.list12
-rw-r--r--shell/e-shell-offline-handler.c6
-rw-r--r--shell/e-shell-view.c2
-rw-r--r--shell/e-shell.c4
-rw-r--r--shell/e-shortcuts-view.c5
-rw-r--r--shell/e-shortcuts.c2
-rw-r--r--shell/e-storage-set.c2
-rw-r--r--shell/evolution-activity-client.c6
-rw-r--r--shell/evolution-config-control.c4
-rw-r--r--shell/evolution-folder-selector-button.c8
-rw-r--r--shell/evolution-session.c6
-rw-r--r--shell/evolution-shell-view.c14
-rw-r--r--shell/evolution-storage-listener.c12
-rw-r--r--shell/evolution-storage-set-view-listener.c6
-rw-r--r--shell/evolution-storage.c18
-rw-r--r--shell/evolution-wizard.c32
21 files changed, 144 insertions, 61 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index d6f6e57bec..da69a3e029 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,3 +1,47 @@
+2002-11-20 Chris Toshok <toshok@ximian.com>
+
+ * e-folder-list.c (e_folder_list_class_init): use e_shell_
+ marshallers, and make sure STRING parameters map to *_STRING*
+ marshallers.
+
+ * evolution-wizard.c (evolution_wizard_class_init): same.
+
+ * evolution-storage.c (class_init): same.
+
+ * evolution-storage-set-view-listener.c (class_init): same.
+
+ * evolution-storage-listener.c (class_init): same.
+
+ * evolution-shell-view.c (class_init): same.
+
+ * evolution-session.c (class_init): same.
+
+ * evolution-folder-selector-button.c (class_init): same.
+
+ * evolution-config-control.c (class_init): same.
+
+ * evolution-activity-client.c (class_init): same.
+
+ * e-storage-set.c (class_init): same.
+
+ * e-shortcuts.c (class_init): same.
+
+ * e-shortcuts-view.c (class_init): same.
+
+ * e-shell.c (class_init): same.
+
+ * e-shell-view.c (class_init): same.
+
+ * e-shell-offline-handler.c (class_init): same.
+
+ * e-shell-folder-title-bar.c (class_init): same.
+
+ * e-shell-folder-selection-dialog.c (class_init): same.
+
+ * e-folder.c (class_init): same.
+
+ * e-shell-marshal.list: add all the STRING marshallers.
+
2002-11-20 Not Zed <NotZed@Ximian.com>
* e-shell-importer.c (prepare_intelligent_page): gnome message box
diff --git a/shell/e-folder-list.c b/shell/e-folder-list.c
index 6f5057b4bc..b6cad2a292 100644
--- a/shell/e-folder-list.c
+++ b/shell/e-folder-list.c
@@ -41,6 +41,7 @@
#include <gal/widgets/e-option-menu.h>
#include "e-folder-list.h"
+#include "e-shell-marshal.h"
#include "Evolution.h"
@@ -233,7 +234,7 @@ e_folder_list_class_init (EFolderListClass *klass)
GTK_RUN_LAST,
E_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EFolderListClass, option_menu_changed),
- gtk_marshal_NONE__INT,
+ e_shell_marshal_NONE__INT,
GTK_TYPE_NONE, 1, GTK_TYPE_INT);
signals [CHANGED] =
@@ -241,7 +242,7 @@ e_folder_list_class_init (EFolderListClass *klass)
GTK_RUN_LAST,
E_OBJECT_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EFolderListClass, changed),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
E_OBJECT_CLASS_ADD_SIGNALS (object_class, signals, LAST_SIGNAL);
diff --git a/shell/e-folder.c b/shell/e-folder.c
index dc4d15f424..5798ea576b 100644
--- a/shell/e-folder.c
+++ b/shell/e-folder.c
@@ -25,6 +25,7 @@
#endif
#include "e-folder.h"
+#include "e-shell-marshal.h"
#include "e-util/e-corba-utils.h"
@@ -146,14 +147,14 @@ class_init (EFolderClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EFolderClass, changed),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[NAME_CHANGED] = gtk_signal_new ("name_changed",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EFolderClass, name_changed),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
klass->save_info = impl_save_info;
diff --git a/shell/e-shell-folder-selection-dialog.c b/shell/e-shell-folder-selection-dialog.c
index 0d04899e78..1d77d6d109 100644
--- a/shell/e-shell-folder-selection-dialog.c
+++ b/shell/e-shell-folder-selection-dialog.c
@@ -27,6 +27,7 @@
#include "e-shell-folder-selection-dialog.h"
#include "e-shell-constants.h"
+#include "e-shell-marshal.h"
#include "e-storage-set-view.h"
#include "e-storage-set.h"
@@ -287,7 +288,7 @@ class_init (EShellFolderSelectionDialogClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellFolderSelectionDialogClass, folder_selected),
- gtk_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
@@ -296,7 +297,7 @@ class_init (EShellFolderSelectionDialogClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellFolderSelectionDialogClass, cancelled),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
}
diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c
index 154b393ac1..328e867828 100644
--- a/shell/e-shell-folder-title-bar.c
+++ b/shell/e-shell-folder-title-bar.c
@@ -37,6 +37,7 @@
#include "widgets/misc/e-clipped-label.h"
#include "e-shell-constants.h"
+#include "e-shell-marshal.h"
#include "e-shell-folder-title-bar.h"
@@ -474,7 +475,7 @@ class_init (EShellFolderTitleBarClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellFolderTitleBarClass, title_toggled),
- gtk_marshal_NONE__BOOL,
+ e_shell_marshal_NONE__BOOL,
GTK_TYPE_NONE, 1,
GTK_TYPE_BOOL);
@@ -482,14 +483,14 @@ class_init (EShellFolderTitleBarClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellFolderTitleBarClass, back_clicked),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[FORWARD_CLICKED] = gtk_signal_new ("forward_clicked",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellFolderTitleBarClass, forward_clicked),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
}
diff --git a/shell/e-shell-marshal.list b/shell/e-shell-marshal.list
index aa9f7b36b9..665620dcae 100644
--- a/shell/e-shell-marshal.list
+++ b/shell/e-shell-marshal.list
@@ -2,8 +2,8 @@ NONE:BOOL
NONE:INT
NONE:INT,INT
NONE:INT,POINTER
+NONE:INT,STRING
NONE:NONE
-NONE:STRING
NONE:POINTER
NONE:POINTER,INT
NONE:POINTER,INT,INT
@@ -12,3 +12,13 @@ NONE:POINTER,POINTER,POINTER
NONE:POINTER,POINTER,POINTER,BOOL
NONE:POINTER,POINTER,POINTER,POINTER
NONE:POINTER,POINTER,POINTER,POINTER,POINTER
+NONE:POINTER,STRING,INT
+NONE:POINTER,STRING,STRING
+NONE:POINTER,STRING,STRING,BOOL
+NONE:POINTER,STRING,STRING,STRING,STRING
+NONE:STRING
+NONE:STRING,INT
+NONE:STRING,INT,INT
+NONE:STRING,POINTER
+NONE:STRING,STRING
+NONE:STRING,STRING,STRING,STRING
diff --git a/shell/e-shell-offline-handler.c b/shell/e-shell-offline-handler.c
index 030f2ff3f8..191220f53c 100644
--- a/shell/e-shell-offline-handler.c
+++ b/shell/e-shell-offline-handler.c
@@ -28,6 +28,8 @@
#include "e-shell-offline-sync.h"
+#include "e-shell-marshal.h"
+
#include <gtk/gtktypeutils.h>
#include <gtk/gtksignal.h>
#include <gtk/gtkwidget.h>
@@ -723,7 +725,7 @@ class_init (EShellOfflineHandlerClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellOfflineHandlerClass, offline_procedure_started),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[OFFLINE_PROCEDURE_FINISHED]
@@ -731,7 +733,7 @@ class_init (EShellOfflineHandlerClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellOfflineHandlerClass, offline_procedure_finished),
- gtk_marshal_NONE__BOOL,
+ e_shell_marshal_NONE__BOOL,
GTK_TYPE_NONE, 1,
GTK_TYPE_BOOL);
}
diff --git a/shell/e-shell-view.c b/shell/e-shell-view.c
index 94b0d33e65..c7f92413a3 100644
--- a/shell/e-shell-view.c
+++ b/shell/e-shell-view.c
@@ -1540,7 +1540,7 @@ class_init (EShellViewClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellViewClass, view_changed),
- e_shell_marshal_NONE__POINTER_POINTER_POINTER_POINTER,
+ e_shell_marshal_NONE__STRING_STRING_STRING_STRING,
GTK_TYPE_NONE, 4,
GTK_TYPE_STRING,
GTK_TYPE_STRING,
diff --git a/shell/e-shell.c b/shell/e-shell.c
index 7a608ee0ad..d43cdef323 100644
--- a/shell/e-shell.c
+++ b/shell/e-shell.c
@@ -1179,7 +1179,7 @@ class_init (EShellClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellClass, no_views_left),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[LINE_STATUS_CHANGED] =
@@ -1196,7 +1196,7 @@ class_init (EShellClass *klass)
GTK_RUN_LAST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShellClass, new_view_created),
- gtk_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c
index 6a2d911926..1575cff679 100644
--- a/shell/e-shortcuts-view.c
+++ b/shell/e-shortcuts-view.c
@@ -28,6 +28,7 @@
#include "e-folder-dnd-bridge.h"
#include "e-shell-constants.h"
+#include "e-shell-marshal.h"
#include "e-shortcuts-view-model.h"
#include "e-util/e-request.h"
@@ -711,7 +712,7 @@ class_init (EShortcutsViewClass *klass)
GTK_RUN_LAST | GTK_RUN_ACTION,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShortcutsViewClass, activate_shortcut),
- e_marshal_NONE__POINTER_POINTER_INT,
+ e_shell_marshal_NONE__POINTER_STRING_INT,
GTK_TYPE_NONE, 3,
GTK_TYPE_POINTER,
GTK_TYPE_STRING,
@@ -723,7 +724,7 @@ class_init (EShortcutsViewClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShortcutsViewClass,
hide_requested),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
}
diff --git a/shell/e-shortcuts.c b/shell/e-shortcuts.c
index a1cd88a272..478327c02f 100644
--- a/shell/e-shortcuts.c
+++ b/shell/e-shortcuts.c
@@ -702,7 +702,7 @@ class_init (EShortcutsClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EShortcutsClass, rename_group),
- e_shell_marshal_NONE__INT_POINTER,
+ e_shell_marshal_NONE__INT_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_INT,
GTK_TYPE_STRING);
diff --git a/shell/e-storage-set.c b/shell/e-storage-set.c
index 3cc17d1bdb..82f25afce4 100644
--- a/shell/e-storage-set.c
+++ b/shell/e-storage-set.c
@@ -431,7 +431,7 @@ class_init (EStorageSetClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EStorageSetClass, moved_folder),
- e_shell_marshal_NONE__POINTER_POINTER,
+ e_shell_marshal_NONE__STRING_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_STRING);
diff --git a/shell/evolution-activity-client.c b/shell/evolution-activity-client.c
index 0047091768..38d59b2139 100644
--- a/shell/evolution-activity-client.c
+++ b/shell/evolution-activity-client.c
@@ -33,6 +33,8 @@
#include "e-shell-corba-icon-utils.h"
+#include "e-shell-marshal.h"
+
#include <gtk/gtksignal.h>
#include <gtk/gtkmain.h>
@@ -229,7 +231,7 @@ class_init (EvolutionActivityClientClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionActivityClientClass, show_details),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[CANCEL]
@@ -237,7 +239,7 @@ class_init (EvolutionActivityClientClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionActivityClientClass, cancel),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
}
diff --git a/shell/evolution-config-control.c b/shell/evolution-config-control.c
index 2036cca249..da781292ff 100644
--- a/shell/evolution-config-control.c
+++ b/shell/evolution-config-control.c
@@ -26,6 +26,8 @@
#include "evolution-config-control.h"
+#include "e-shell-marshal.h"
+
#include <gal/util/e-util.h>
#include <gtk/gtksignal.h>
@@ -155,7 +157,7 @@ class_init (EvolutionConfigControlClass *class)
signals[APPLY] = gtk_signal_new ("apply", GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionConfigControlClass, apply),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
parent_class = gtk_type_class (PARENT_TYPE);
diff --git a/shell/evolution-folder-selector-button.c b/shell/evolution-folder-selector-button.c
index 39d05354e9..4f11935c84 100644
--- a/shell/evolution-folder-selector-button.c
+++ b/shell/evolution-folder-selector-button.c
@@ -24,6 +24,8 @@
#include "evolution-folder-selector-button.h"
+#include "e-shell-marshal.h"
+
#include <gal/util/e-util.h>
#include <gal/widgets/e-unicode.h>
@@ -257,20 +259,20 @@ class_init (EvolutionFolderSelectorButtonClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionFolderSelectorButtonClass, popped_up),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[SELECTED] = gtk_signal_new ("selected",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionFolderSelectorButtonClass, selected),
- gtk_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__POINTER,
GTK_TYPE_NONE, 1,
GTK_TYPE_POINTER);
signals[CANCELED] = gtk_signal_new ("canceled",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionFolderSelectorButtonClass, canceled),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
}
diff --git a/shell/evolution-session.c b/shell/evolution-session.c
index d7c25ea99a..9971f680d7 100644
--- a/shell/evolution-session.c
+++ b/shell/evolution-session.c
@@ -31,6 +31,8 @@
#include "evolution-session.h"
+#include "e-shell-marshal.h"
+
#define PARENT_TYPE bonobo_x_object_get_type ()
static BonoboXObjectClass *parent_class = NULL;
@@ -126,7 +128,7 @@ class_init (EvolutionSessionClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionSessionClass, load_configuration),
- gtk_marshal_NONE__STRING,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
signals[SAVE_CONFIGURATION]
@@ -134,7 +136,7 @@ class_init (EvolutionSessionClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionSessionClass, save_configuration),
- gtk_marshal_NONE__STRING,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
index b7cdb40bc3..7ec337ee55 100644
--- a/shell/evolution-shell-view.c
+++ b/shell/evolution-shell-view.c
@@ -30,6 +30,8 @@
#include "evolution-shell-view.h"
+#include "e-shell-marshal.h"
+
#define PARENT_TYPE bonobo_x_object_get_type ()
static BonoboXObjectClass *parent_class = NULL;
@@ -166,7 +168,7 @@ class_init (EvolutionShellViewClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_message),
- gtk_marshal_NONE__POINTER_INT,
+ e_shell_marshal_NONE__STRING_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_BOOL);
@@ -176,7 +178,7 @@ class_init (EvolutionShellViewClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionShellViewClass, unset_message),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[CHANGE_VIEW]
@@ -184,7 +186,7 @@ class_init (EvolutionShellViewClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionShellViewClass, change_current_view),
- gtk_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
@@ -193,7 +195,7 @@ class_init (EvolutionShellViewClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_title),
- gtk_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
@@ -202,7 +204,7 @@ class_init (EvolutionShellViewClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionShellViewClass, set_folder_bar_label),
- gtk_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
@@ -211,7 +213,7 @@ class_init (EvolutionShellViewClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionShellViewClass, show_settings),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
parent_class = gtk_type_class (bonobo_x_object_get_type ());
diff --git a/shell/evolution-storage-listener.c b/shell/evolution-storage-listener.c
index e33d0bd735..f0570a3844 100644
--- a/shell/evolution-storage-listener.c
+++ b/shell/evolution-storage-listener.c
@@ -30,6 +30,8 @@
#include "evolution-storage-listener.h"
+#include "e-shell-marshal.h"
+
#define PARENT_TYPE gtk_object_get_type ()
static GtkObjectClass *parent_class = NULL;
@@ -258,14 +260,14 @@ class_init (EvolutionStorageListenerClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, destroyed),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
signals[NEW_FOLDER] = gtk_signal_new ("new_folder",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, new_folder),
- gtk_marshal_NONE__POINTER_POINTER,
+ e_shell_marshal_NONE__STRING_POINTER,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_POINTER);
@@ -274,7 +276,7 @@ class_init (EvolutionStorageListenerClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, update_folder),
- gtk_marshal_NONE__POINTER_INT,
+ e_shell_marshal_NONE__STRING_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_INT);
@@ -283,7 +285,7 @@ class_init (EvolutionStorageListenerClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, removed_folder),
- gtk_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
@@ -291,7 +293,7 @@ class_init (EvolutionStorageListenerClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageListenerClass, has_subfolders),
- gtk_marshal_NONE__POINTER_POINTER,
+ e_shell_marshal_NONE__STRING_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_STRING);
diff --git a/shell/evolution-storage-set-view-listener.c b/shell/evolution-storage-set-view-listener.c
index 82e4f4f671..b0f23ef50d 100644
--- a/shell/evolution-storage-set-view-listener.c
+++ b/shell/evolution-storage-set-view-listener.c
@@ -30,6 +30,8 @@
#include "evolution-storage-set-view-listener.h"
+#include "e-shell-marshal.h"
+
#define PARENT_TYPE gtk_object_get_type ()
static GtkObjectClass *parent_class = NULL;
@@ -202,14 +204,14 @@ class_init (EvolutionStorageSetViewListenerClass *klass)
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageSetViewListenerClass, folder_selected),
- gtk_marshal_NONE__STRING,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
signals[FOLDER_TOGGLED] = gtk_signal_new ("folder_toggled",
GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageSetViewListenerClass, folder_toggled),
- gtk_marshal_NONE__NONE,
+ e_shell_marshal_NONE__NONE,
GTK_TYPE_NONE, 0);
corba_class_init ();
diff --git a/shell/evolution-storage.c b/shell/evolution-storage.c
index 9722e5aa28..60261c8847 100644
--- a/shell/evolution-storage.c
+++ b/shell/evolution-storage.c
@@ -711,7 +711,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
create_folder),
- e_shell_marshal_NONE__POINTER_POINTER_POINTER_POINTER_POINTER,
+ e_shell_marshal_NONE__POINTER_STRING_STRING_STRING_STRING,
GTK_TYPE_NONE, 5,
GTK_TYPE_POINTER,
GTK_TYPE_STRING,
@@ -724,7 +724,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
remove_folder),
- e_shell_marshal_NONE__POINTER_POINTER_POINTER,
+ e_shell_marshal_NONE__POINTER_STRING_STRING,
GTK_TYPE_NONE, 3,
GTK_TYPE_POINTER,
GTK_TYPE_STRING,
@@ -735,7 +735,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
xfer_folder),
- e_shell_marshal_NONE__POINTER_POINTER_POINTER_BOOL,
+ e_shell_marshal_NONE__POINTER_STRING_STRING_BOOL,
GTK_TYPE_NONE, 4,
GTK_TYPE_POINTER,
GTK_TYPE_STRING,
@@ -747,7 +747,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
update_folder),
- e_shell_marshal_NONE__POINTER_INT,
+ e_shell_marshal_NONE__STRING_INT,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_INT);
@@ -757,7 +757,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
open_folder),
- e_shell_marshal_NONE__POINTER,
+ e_shell_marshal_NONE__STRING,
GTK_TYPE_NONE, 1,
GTK_TYPE_STRING);
@@ -766,7 +766,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
discover_shared_folder),
- e_shell_marshal_NONE__POINTER_POINTER_POINTER,
+ e_shell_marshal_NONE__POINTER_STRING_STRING,
GTK_TYPE_NONE, 3,
GTK_TYPE_POINTER,
GTK_TYPE_STRING,
@@ -777,7 +777,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
cancel_discover_shared_folder),
- e_shell_marshal_NONE__POINTER_POINTER,
+ e_shell_marshal_NONE__STRING_STRING,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_STRING);
@@ -787,7 +787,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
remove_shared_folder),
- e_shell_marshal_NONE__POINTER_POINTER,
+ e_shell_marshal_NONE__STRING_POINTER,
GTK_TYPE_NONE, 2,
GTK_TYPE_STRING,
GTK_TYPE_POINTER);
@@ -797,7 +797,7 @@ class_init (EvolutionStorageClass *klass)
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionStorageClass,
show_folder_properties),
- e_shell_marshal_NONE__POINTER_INT_INT,
+ e_shell_marshal_NONE__STRING_INT_INT,
GTK_TYPE_NONE, 3,
GTK_TYPE_STRING,
GTK_TYPE_INT,
diff --git a/shell/evolution-wizard.c b/shell/evolution-wizard.c
index 92b3ba163a..fdc1046c5f 100644
--- a/shell/evolution-wizard.c
+++ b/shell/evolution-wizard.c
@@ -36,6 +36,8 @@
#include "evolution-wizard.h"
#include "Evolution.h"
+#include "e-shell-marshal.h"
+
struct _EvolutionWizardPrivate {
EvolutionWizardGetControlFn get_fn;
BonoboEventSource *event_source;
@@ -191,33 +193,39 @@ evolution_wizard_class_init (EvolutionWizardClass *klass)
signals[NEXT] = gtk_signal_new ("next", GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionWizardClass, next),
- gtk_marshal_NONE__INT, GTK_TYPE_NONE,
- 1, GTK_TYPE_INT);
+ e_shell_marshal_NONE__INT,
+ GTK_TYPE_NONE, 1,
+ GTK_TYPE_INT);
signals[PREPARE] = gtk_signal_new ("prepare", GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionWizardClass, prepare),
- gtk_marshal_NONE__INT, GTK_TYPE_NONE,
- 1, GTK_TYPE_INT);
+ e_shell_marshal_NONE__INT,
+ GTK_TYPE_NONE, 1,
+ GTK_TYPE_INT);
signals[BACK] = gtk_signal_new ("back", GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionWizardClass, back),
- gtk_marshal_NONE__INT, GTK_TYPE_NONE,
- 1, GTK_TYPE_INT);
+ e_shell_marshal_NONE__INT,
+ GTK_TYPE_NONE, 1,
+ GTK_TYPE_INT);
signals[FINISH] = gtk_signal_new ("finish", GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionWizardClass, finish),
- gtk_marshal_NONE__INT, GTK_TYPE_NONE,
- 1, GTK_TYPE_INT);
+ e_shell_marshal_NONE__INT,
+ GTK_TYPE_NONE, 1,
+ GTK_TYPE_INT);
signals[CANCEL] = gtk_signal_new ("cancel", GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionWizardClass, cancel),
- gtk_marshal_NONE__INT, GTK_TYPE_NONE,
- 1, GTK_TYPE_INT);
+ e_shell_marshal_NONE__INT,
+ GTK_TYPE_NONE, 1,
+ GTK_TYPE_INT);
signals[HELP] = gtk_signal_new ("help", GTK_RUN_FIRST,
GTK_CLASS_TYPE (object_class),
GTK_SIGNAL_OFFSET (EvolutionWizardClass, help),
- gtk_marshal_NONE__INT, GTK_TYPE_NONE,
- 1, GTK_TYPE_INT);
+ e_shell_marshal_NONE__INT,
+ GTK_TYPE_NONE, 1,
+ GTK_TYPE_INT);
parent_class = gtk_type_class (PARENT_TYPE);