aboutsummaryrefslogtreecommitdiffstats
path: root/addressbook/gui/contact-editor
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 /addressbook/gui/contact-editor
parent8d21ab98d99ca43ee7873adba8172b699d8a007f (diff)
downloadgsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar
gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.gz
gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.bz2
gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.lz
gsoc2013-evolution-979203663083ef89f678dc1e95bc0c9b24f55a9e.tar.xz
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 'addressbook/gui/contact-editor')
-rw-r--r--addressbook/gui/contact-editor/Makefile.am8
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor-marshal.list1
-rw-r--r--addressbook/gui/contact-editor/e-contact-editor.c1
-rw-r--r--addressbook/gui/contact-editor/eab-editor.c8
4 files changed, 5 insertions, 13 deletions
diff --git a/addressbook/gui/contact-editor/Makefile.am b/addressbook/gui/contact-editor/Makefile.am
index e8692bb7f2..bed73df00b 100644
--- a/addressbook/gui/contact-editor/Makefile.am
+++ b/addressbook/gui/contact-editor/Makefile.am
@@ -18,7 +18,6 @@ privsolib_LTLIBRARIES = \
libecontacteditor.la
libecontacteditor_la_SOURCES = \
- $(MARSHAL_GENERATED) \
eab-editor.c \
eab-editor.h \
e-contact-editor-im.c \
@@ -40,17 +39,12 @@ libecontacteditor_la_LIBADD = \
$(top_builddir)/e-util/libeutil.la \
$(EVOLUTION_ADDRESSBOOK_LIBS)
-MARSHAL_GENERATED = e-contact-editor-marshal.c e-contact-editor-marshal.h
-@EVO_MARSHAL_RULE@
-
glade_DATA = \
im.glade \
contact-editor.glade \
fulladdr.glade \
fullname.glade
-BUILT_SOURCES = $(MARSHAL_GENERATED)
CLEANFILES = $(BUILT_SOURCES)
-EXTRA_DIST= $(glade_DATA) \
- e-contact-editor-marshal.list
+EXTRA_DIST= $(glade_DATA)
diff --git a/addressbook/gui/contact-editor/e-contact-editor-marshal.list b/addressbook/gui/contact-editor/e-contact-editor-marshal.list
deleted file mode 100644
index f871960b0d..0000000000
--- a/addressbook/gui/contact-editor/e-contact-editor-marshal.list
+++ /dev/null
@@ -1 +0,0 @@
-NONE:INT,OBJECT
diff --git a/addressbook/gui/contact-editor/e-contact-editor.c b/addressbook/gui/contact-editor/e-contact-editor.c
index e629877eb0..7e85394f02 100644
--- a/addressbook/gui/contact-editor/e-contact-editor.c
+++ b/addressbook/gui/contact-editor/e-contact-editor.c
@@ -56,7 +56,6 @@
#include "e-contact-editor-address.h"
#include "e-contact-editor-im.h"
#include "e-contact-editor-fullname.h"
-#include "e-contact-editor-marshal.h"
#define EMAIL_SLOTS 4
#define PHONE_SLOTS 8
diff --git a/addressbook/gui/contact-editor/eab-editor.c b/addressbook/gui/contact-editor/eab-editor.c
index 90005ac0f9..4b3b8f4395 100644
--- a/addressbook/gui/contact-editor/eab-editor.c
+++ b/addressbook/gui/contact-editor/eab-editor.c
@@ -26,8 +26,8 @@
#include <glib/gi18n.h>
#include "eab-editor.h"
+#include "e-util/e-util.h"
#include "addressbook/gui/widgets/eab-gui-util.h"
-#include "e-contact-editor-marshal.h"
static void eab_editor_default_show (EABEditor *editor);
static void eab_editor_default_raise (EABEditor *editor);
@@ -140,7 +140,7 @@ eab_editor_class_init (EABEditorClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EABEditorClass, contact_added),
NULL, NULL,
- e_contact_editor_marshal_NONE__INT_OBJECT,
+ e_marshal_NONE__INT_OBJECT,
G_TYPE_NONE, 2,
G_TYPE_INT, G_TYPE_OBJECT);
@@ -150,7 +150,7 @@ eab_editor_class_init (EABEditorClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EABEditorClass, contact_modified),
NULL, NULL,
- e_contact_editor_marshal_NONE__INT_OBJECT,
+ e_marshal_NONE__INT_OBJECT,
G_TYPE_NONE, 2,
G_TYPE_INT, G_TYPE_OBJECT);
@@ -160,7 +160,7 @@ eab_editor_class_init (EABEditorClass *klass)
G_SIGNAL_RUN_FIRST,
G_STRUCT_OFFSET (EABEditorClass, contact_deleted),
NULL, NULL,
- e_contact_editor_marshal_NONE__INT_OBJECT,
+ e_marshal_NONE__INT_OBJECT,
G_TYPE_NONE, 2,
G_TYPE_INT, G_TYPE_OBJECT);