aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--shell/ChangeLog9
-rw-r--r--shell/e-shell-marshal.list3
-rw-r--r--shell/e-shortcuts-view.c2
-rw-r--r--shell/evolution-shell-view.c2
4 files changed, 13 insertions, 3 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog
index f95e685a24..29c1897559 100644
--- a/shell/ChangeLog
+++ b/shell/ChangeLog
@@ -1,5 +1,14 @@
2003-02-06 Not Zed <NotZed@Ximian.com>
+ * e-shortcuts-view.c (class_init): use POINTER_STRING_BOOL for
+ activate_shortcut.
+
+ * e-shell-marshal.list: Added NONE,STRING,BOOL, and
+ POINTER,STRING,BOOL, removed POINTER,STRING,INT
+
+ * evolution-shell-view.c (evolution_shell_view_class_init): Use
+ STRING_BOOL for the set_message signal to match rest of command.
+
* e-shell-marshal.list: Added NONE,STRING,STRING,STRING
* evolution-shell-component.c
diff --git a/shell/e-shell-marshal.list b/shell/e-shell-marshal.list
index e31360614d..6ff6579189 100644
--- a/shell/e-shell-marshal.list
+++ b/shell/e-shell-marshal.list
@@ -12,11 +12,12 @@ 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,BOOL
NONE:POINTER,STRING,STRING
NONE:POINTER,STRING,STRING,BOOL
NONE:POINTER,STRING,STRING,STRING,STRING
NONE:STRING
+NONE:STRING,BOOL
NONE:STRING,INT
NONE:STRING,INT,INT
NONE:STRING,POINTER
diff --git a/shell/e-shortcuts-view.c b/shell/e-shortcuts-view.c
index ba6115d07c..ce1a976936 100644
--- a/shell/e-shortcuts-view.c
+++ b/shell/e-shortcuts-view.c
@@ -716,7 +716,7 @@ class_init (EShortcutsViewClass *klass)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EShortcutsViewClass, activate_shortcut),
NULL, NULL,
- e_shell_marshal_NONE__POINTER_STRING_INT,
+ e_shell_marshal_NONE__POINTER_STRING_BOOL,
G_TYPE_NONE, 3,
G_TYPE_POINTER,
G_TYPE_STRING,
diff --git a/shell/evolution-shell-view.c b/shell/evolution-shell-view.c
index 3091c3565f..4858d18e24 100644
--- a/shell/evolution-shell-view.c
+++ b/shell/evolution-shell-view.c
@@ -169,7 +169,7 @@ evolution_shell_view_class_init (EvolutionShellViewClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EvolutionShellViewClass, set_message),
NULL, NULL,
- e_shell_marshal_NONE__STRING_INT,
+ e_shell_marshal_NONE__STRING_BOOL,
G_TYPE_NONE, 2,
G_TYPE_STRING,
G_TYPE_BOOLEAN);