aboutsummaryrefslogtreecommitdiffstats
path: root/widgets/misc
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@src.gnome.org>2008-09-18 11:31:42 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-09-18 11:31:42 +0800
commit979203663083ef89f678dc1e95bc0c9b24f55a9e (patch)
tree6fbdcf5e78079607eb176059c900c16ea5ce438f /widgets/misc
parent8d21ab98d99ca43ee7873adba8172b699d8a007f (diff)
downloadgsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.gz
gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.zst
gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.zip
Progress update:
- Kill EABMenu. - Centralize marshallers to eliminate duplication. svn path=/branches/kill-bonobo/; revision=36368
Diffstat (limited to 'widgets/misc')
-rw-r--r--widgets/misc/e-dateedit.c1
-rw-r--r--widgets/misc/e-image-chooser.c1
-rw-r--r--widgets/misc/e-map.c2
-rw-r--r--widgets/misc/e-printable.c10
-rw-r--r--widgets/misc/e-reflow-model.c4
-rw-r--r--widgets/misc/e-reflow.c3
-rw-r--r--widgets/misc/e-search-bar.c1
-rw-r--r--widgets/misc/e-selection-model.c5
8 files changed, 9 insertions, 18 deletions
diff --git a/widgets/misc/e-dateedit.c b/widgets/misc/e-dateedit.c
index 82847d729e..1ffe823f4c 100644
--- a/widgets/misc/e-dateedit.c
+++ b/widgets/misc/e-dateedit.c
@@ -35,7 +35,6 @@
#endif
#include "e-dateedit.h"
-#include "e-util/e-util-marshal.h"
#include <ctype.h>
#include <stdio.h>
diff --git a/widgets/misc/e-image-chooser.c b/widgets/misc/e-image-chooser.c
index 8057d23aaa..20252f1b92 100644
--- a/widgets/misc/e-image-chooser.c
+++ b/widgets/misc/e-image-chooser.c
@@ -28,7 +28,6 @@
#include <glib/gi18n.h>
#include "e-image-chooser.h"
-#include "e-util/e-util-marshal.h"
#include "e-util/e-icon-factory.h"
#include "e-util/e-util.h"
diff --git a/widgets/misc/e-map.c b/widgets/misc/e-map.c
index 347b97ca7c..f9742b597f 100644
--- a/widgets/misc/e-map.c
+++ b/widgets/misc/e-map.c
@@ -183,7 +183,7 @@ e_map_class_init (EMapClass *class)
G_SIGNAL_RUN_LAST | G_SIGNAL_ACTION,
G_STRUCT_OFFSET (EMapClass, set_scroll_adjustments),
NULL, NULL,
- e_util_marshal_NONE__OBJECT_OBJECT,
+ e_marshal_NONE__OBJECT_OBJECT,
G_TYPE_NONE, 2,
GTK_TYPE_ADJUSTMENT,
GTK_TYPE_ADJUSTMENT);
diff --git a/widgets/misc/e-printable.c b/widgets/misc/e-printable.c
index f5392cc201..7f2db7ecc4 100644
--- a/widgets/misc/e-printable.c
+++ b/widgets/misc/e-printable.c
@@ -24,8 +24,6 @@
#include <gtk/gtk.h>
-#include "e-util/e-util-marshal.h"
-
#include "e-util/e-util.h"
#include "e-printable.h"
@@ -57,7 +55,7 @@ e_printable_class_init (EPrintableClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, print_page),
NULL, NULL,
- e_util_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+ e_marshal_NONE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
G_TYPE_NONE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
@@ -67,7 +65,7 @@ e_printable_class_init (EPrintableClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, data_left),
NULL, NULL,
- e_util_marshal_BOOLEAN__NONE,
+ e_marshal_BOOLEAN__NONE,
G_TYPE_BOOLEAN, 0, G_TYPE_NONE);
e_printable_signals [RESET] =
@@ -85,7 +83,7 @@ e_printable_class_init (EPrintableClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, height),
NULL, NULL,
- e_util_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+ e_marshal_DOUBLE__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
G_TYPE_DOUBLE, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
@@ -95,7 +93,7 @@ e_printable_class_init (EPrintableClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EPrintableClass, will_fit),
NULL, NULL,
- e_util_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
+ e_marshal_BOOLEAN__OBJECT_DOUBLE_DOUBLE_BOOLEAN,
G_TYPE_BOOLEAN, 4, G_TYPE_OBJECT, G_TYPE_DOUBLE,
G_TYPE_DOUBLE, G_TYPE_BOOLEAN);
diff --git a/widgets/misc/e-reflow-model.c b/widgets/misc/e-reflow-model.c
index 8f206e20c6..eae3d43324 100644
--- a/widgets/misc/e-reflow-model.c
+++ b/widgets/misc/e-reflow-model.c
@@ -22,8 +22,6 @@
*/
#include <config.h>
-#include "e-util/e-util-marshal.h"
-
#include "e-util/e-util.h"
#include "e-reflow-model.h"
@@ -178,7 +176,7 @@ e_reflow_model_class_init (EReflowModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowModelClass, model_items_inserted),
NULL, NULL,
- e_util_marshal_NONE__INT_INT,
+ e_marshal_NONE__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
e_reflow_model_signals [MODEL_ITEM_CHANGED] =
diff --git a/widgets/misc/e-reflow.c b/widgets/misc/e-reflow.c
index 2a2725c4ef..6fd7021b54 100644
--- a/widgets/misc/e-reflow.c
+++ b/widgets/misc/e-reflow.c
@@ -31,7 +31,6 @@
#include "text/e-text.h"
#include <glib/gi18n.h>
-#include "e-util/e-util-marshal.h"
#include "e-util/e-util.h"
#include "misc/e-unicode.h"
@@ -1470,7 +1469,7 @@ e_reflow_class_init (EReflowClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (EReflowClass, selection_event),
NULL, NULL,
- e_util_marshal_INT__OBJECT_BOXED,
+ e_marshal_INT__OBJECT_BOXED,
G_TYPE_INT, 2, G_TYPE_OBJECT,
GDK_TYPE_EVENT);
diff --git a/widgets/misc/e-search-bar.c b/widgets/misc/e-search-bar.c
index fa8b099569..1cd67e8459 100644
--- a/widgets/misc/e-search-bar.c
+++ b/widgets/misc/e-search-bar.c
@@ -33,7 +33,6 @@
#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include <e-util/e-util.h>
-#include <e-util/e-util-marshal.h>
#include <e-action-combo-box.h>
#include <e-gui-utils.h>
diff --git a/widgets/misc/e-selection-model.c b/widgets/misc/e-selection-model.c
index 4e473f80bb..697bb68096 100644
--- a/widgets/misc/e-selection-model.c
+++ b/widgets/misc/e-selection-model.c
@@ -25,7 +25,6 @@
#include <gdk/gdkkeysyms.h>
#include <glib/gi18n.h>
-#include "e-util/e-util-marshal.h"
#include "e-util/e-util.h"
#include "e-selection-model.h"
@@ -151,7 +150,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, cursor_changed),
NULL, NULL,
- e_util_marshal_NONE__INT_INT,
+ e_marshal_NONE__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
e_selection_model_signals [CURSOR_ACTIVATED] =
@@ -160,7 +159,7 @@ e_selection_model_class_init (ESelectionModelClass *klass)
G_SIGNAL_RUN_LAST,
G_STRUCT_OFFSET (ESelectionModelClass, cursor_activated),
NULL, NULL,
- e_util_marshal_NONE__INT_INT,
+ e_marshal_NONE__INT_INT,
G_TYPE_NONE, 2, G_TYPE_INT, G_TYPE_INT);
e_selection_model_signals [SELECTION_CHANGED] =