diff options
Diffstat (limited to 'e-util')
-rw-r--r-- | e-util/e-marshal.list | 8 | ||||
-rw-r--r-- | e-util/e-util.c | 30 | ||||
-rw-r--r-- | e-util/e-util.h | 6 |
3 files changed, 5 insertions, 39 deletions
diff --git a/e-util/e-marshal.list b/e-util/e-marshal.list index 823005bac8..ab270d2f34 100644 --- a/e-util/e-marshal.list +++ b/e-util/e-marshal.list @@ -20,10 +20,6 @@ INT:INT,INT,BOXED INT:INT,POINTER,INT,BOXED INT:OBJECT,BOXED INT:POINTER -NONE:BOXED,STRING -NONE:BOXED,STRING,INT -NONE:BOXED,STRING,STRING -NONE:BOXED,STRING,STRING,INT,STRING,STRING,STRING NONE:INT,INT NONE:INT,INT,BOXED NONE:INT,INT,OBJECT @@ -41,6 +37,10 @@ NONE:LONG,LONG NONE:OBJECT,BOOLEAN NONE:OBJECT,DOUBLE,DOUBLE,BOOLEAN NONE:OBJECT,OBJECT +NONE:OBJECT,STRING +NONE:OBJECT,STRING,INT +NONE:OBJECT,STRING,STRING +NONE:OBJECT,STRING,STRING,INT,STRING,STRING,STRING NONE:POINTER,INT NONE:POINTER,INT,INT,INT,INT NONE:POINTER,INT,OBJECT diff --git a/e-util/e-util.c b/e-util/e-util.c index e55edfb883..3728489fa4 100644 --- a/e-util/e-util.c +++ b/e-util/e-util.c @@ -48,6 +48,7 @@ #include <windows.h> #endif +#include <camel/camel.h> #include <libedataserver/e-data-server-util.h> #include <libedataserver/e-categories.h> #include <libedataserver/e-source-list.h> @@ -1484,32 +1485,3 @@ e_util_set_source_combo_box_list (GtkWidget *source_combo_box, g_object_unref (gconf_client); } -static gpointer -e_camel_object_copy (gpointer camel_object) -{ - if (CAMEL_IS_OBJECT (camel_object)) - g_object_ref (camel_object); - - return camel_object; -} - -static void -e_camel_object_free (gpointer camel_object) -{ - if (CAMEL_IS_OBJECT (camel_object)) - g_object_unref (camel_object); -} - -GType -e_camel_object_get_type (void) -{ - static GType type = 0; - - if (G_UNLIKELY (type == 0)) - type = g_boxed_type_register_static ( - "ECamelObject", - (GBoxedCopyFunc) e_camel_object_copy, - (GBoxedFreeFunc) e_camel_object_free); - - return type; -} diff --git a/e-util/e-util.h b/e-util/e-util.h index c3459195a3..6f7e56b07f 100644 --- a/e-util/e-util.h +++ b/e-util/e-util.h @@ -26,7 +26,6 @@ #include <sys/types.h> #include <gtk/gtk.h> #include <limits.h> -#include <camel/camel.h> #include <gconf/gconf-client.h> #include <e-util/e-marshal.h> @@ -142,11 +141,6 @@ GSList * e_util_get_category_filter_options void e_util_set_source_combo_box_list(GtkWidget *source_combo_box, const gchar *source_gconf_path); -/* Camel uses its own object system, so we have to box - * CamelObjects to safely use them as GObject properties. */ -#define E_TYPE_CAMEL_OBJECT (e_camel_object_get_type ()) -GType e_camel_object_get_type (void); - G_END_DECLS #endif /* E_UTIL_H */ |