diff options
| author | Matthew Barnes <mbarnes@src.gnome.org> | 2007-09-28 04:08:55 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@src.gnome.org> | 2007-09-28 04:08:55 +0800 |
| commit | e2e5e8d754f24a9f5c1ed0434c83dcd486a356eb (patch) | |
| tree | 1b85999b0475986f41f1f27abbd24d4a89dead3f /shell | |
| parent | 37c142d956ca60725b1e989e95860e185156f5e9 (diff) | |
| download | gsoc2013-evolution-e2e5e8d754f24a9f5c1ed0434c83dcd486a356eb.tar.gz gsoc2013-evolution-e2e5e8d754f24a9f5c1ed0434c83dcd486a356eb.tar.zst gsoc2013-evolution-e2e5e8d754f24a9f5c1ed0434c83dcd486a356eb.zip | |
Fix for bug #461195 from Hiroyuki Ikezoe.
Use GObject's marshalers whenever possible.
svn path=/trunk/; revision=34324
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/ChangeLog | 11 | ||||
| -rw-r--r-- | shell/e-shell-folder-title-bar.c | 6 | ||||
| -rw-r--r-- | shell/e-shell-marshal.list | 5 | ||||
| -rw-r--r-- | shell/e-shell-window.c | 2 | ||||
| -rw-r--r-- | shell/e-shell.c | 6 | ||||
| -rw-r--r-- | shell/e-sidebar.c | 2 |
6 files changed, 19 insertions, 13 deletions
diff --git a/shell/ChangeLog b/shell/ChangeLog index d870742ffc..5bc2c5ba7c 100644 --- a/shell/ChangeLog +++ b/shell/ChangeLog @@ -1,3 +1,14 @@ +2007-09-27 Hiroyuki Ikezoe <poincare@ikezoe.net> + + ** Fix for bug #461195 + + * e-shell-marshal.list: Remove needless marshalers. + * e-shell-folder-title-bar.c: + * e-shell.c: + * e-shell-window.c: + * e-shell-marshal.list: + * e-sidebar.c: Use GObject's marshalers. + 2007-09-27 Matthew Barnes <mbarnes@redhat.com> ** Fixes part of bug #477045 diff --git a/shell/e-shell-folder-title-bar.c b/shell/e-shell-folder-title-bar.c index 16aee674c8..24bf3a58e8 100644 --- a/shell/e-shell-folder-title-bar.c +++ b/shell/e-shell-folder-title-bar.c @@ -417,7 +417,7 @@ e_shell_folder_title_bar_class_init (EShellFolderTitleBarClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EShellFolderTitleBarClass, title_toggled), NULL, NULL, - e_shell_marshal_NONE__BOOL, + g_cclosure_marshal_VOID__BOOLEAN, G_TYPE_NONE, 1, G_TYPE_BOOLEAN); @@ -427,7 +427,7 @@ e_shell_folder_title_bar_class_init (EShellFolderTitleBarClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EShellFolderTitleBarClass, back_clicked), NULL, NULL, - e_shell_marshal_NONE__NONE, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[FORWARD_CLICKED] @@ -436,7 +436,7 @@ e_shell_folder_title_bar_class_init (EShellFolderTitleBarClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EShellFolderTitleBarClass, forward_clicked), NULL, NULL, - e_shell_marshal_NONE__NONE, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); } diff --git a/shell/e-shell-marshal.list b/shell/e-shell-marshal.list index f18d290c80..2b7c3eb383 100644 --- a/shell/e-shell-marshal.list +++ b/shell/e-shell-marshal.list @@ -1,12 +1,8 @@ BOOL:POINTER,INT -NONE:BOOL NONE:BOOL,INT -NONE:INT NONE:INT,INT NONE:INT,POINTER NONE:INT,STRING -NONE:NONE -NONE:POINTER NONE:POINTER,INT NONE:POINTER,INT,INT NONE:POINTER,POINTER @@ -19,7 +15,6 @@ 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 diff --git a/shell/e-shell-window.c b/shell/e-shell-window.c index eb4708cc7a..b97138b8fd 100644 --- a/shell/e-shell-window.c +++ b/shell/e-shell-window.c @@ -998,7 +998,7 @@ e_shell_window_class_init (EShellWindowClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (EShellWindowClass, component_changed), NULL, NULL, - e_shell_marshal_NONE__NONE, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); load_icons (); diff --git a/shell/e-shell.c b/shell/e-shell.c index 5a8091e2af..a5617a909a 100644 --- a/shell/e-shell.c +++ b/shell/e-shell.c @@ -504,7 +504,7 @@ e_shell_class_init (EShellClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EShellClass, no_windows_left), NULL, NULL, - e_shell_marshal_NONE__NONE, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); signals[LINE_STATUS_CHANGED] = @@ -513,7 +513,7 @@ e_shell_class_init (EShellClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EShellClass, line_status_changed), NULL, NULL, - e_shell_marshal_NONE__INT, + g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); @@ -523,7 +523,7 @@ e_shell_class_init (EShellClass *klass) G_SIGNAL_RUN_LAST, G_STRUCT_OFFSET (EShellClass, new_window_created), NULL, NULL, - e_shell_marshal_NONE__POINTER, + g_cclosure_marshal_VOID__POINTER, G_TYPE_NONE, 1, G_TYPE_POINTER); diff --git a/shell/e-sidebar.c b/shell/e-sidebar.c index ab6ea1657f..4fd2e0e3c0 100644 --- a/shell/e-sidebar.c +++ b/shell/e-sidebar.c @@ -469,7 +469,7 @@ e_sidebar_class_init (ESidebarClass *klass) G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET (ESidebarClass, button_selected), NULL, NULL, - e_shell_marshal_NONE__INT, + g_cclosure_marshal_VOID__INT, G_TYPE_NONE, 1, G_TYPE_INT); signals[BUTTON_PRESSED] |