diff options
| author | Marco Barisione <marco@barisione.org> | 2007-08-08 03:03:19 +0800 |
|---|---|---|
| committer | Marco Barisione <mbari@src.gnome.org> | 2007-08-08 03:03:19 +0800 |
| commit | 2d366a83ee60c3c10395900498499e9ff081f3a2 (patch) | |
| tree | b402c16c3a9643cd05acf33802750d1accdb7930 /libempathy-gtk/empathy-contact-list-store.c | |
| parent | 57acf434c3ac37946f2a2d249eafd02a0130d75d (diff) | |
| download | gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.gz gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.bz2 gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.lz gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.xz gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.tar.zst gsoc2013-empathy-2d366a83ee60c3c10395900498499e9ff081f3a2.zip | |
Remove empathy-marshal-main.c and include empathy-marshal.h from
2007-08-07 Marco Barisione <marco@barisione.org>
* libempathy/Makefile.am:
* libempathy/empathy-marshal-main.c: Remove empathy-marshal-main.c and
include empathy-marshal.h from empathy-marshal.c.
* libempathy/Makefile.am:
* libempathy-gtk/Makefile.am: Generate files for enum types with
glib-mkenums.
* libempathy/empathy-contact.c:
* libempathy/empathy-idle.c:
* libempathy/empathy-message.c:
* libempathy/empathy-presence.c:
* libempathy-gtk/empathy-main-window.c:
* libempathy-gtk/empathy-preferences.c:
* doc/libempathy-gtk/libempathy-gtk.types:
* doc/libempathy-gtk/tmpl/empathy-contact-list-store.sgml: Use
g_param_spec_enum() and g_param_spec_flags() instead of
g_param_spec_(u)int.
Fixes bug #462465.
* libempathy-gtk/empathy-contact-list-store.c:
* libempathy-gtk/empathy-contact-list-store.h: Remove
empathy_contact_list_store_sort_get_type() as it's now auto-generated
by glib-mkenums.
svn path=/trunk/; revision=234
Diffstat (limited to 'libempathy-gtk/empathy-contact-list-store.c')
| -rw-r--r-- | libempathy-gtk/empathy-contact-list-store.c | 23 |
1 files changed, 1 insertions, 22 deletions
diff --git a/libempathy-gtk/empathy-contact-list-store.c b/libempathy-gtk/empathy-contact-list-store.c index 3b4892e3c..ac2fa62cd 100644 --- a/libempathy-gtk/empathy-contact-list-store.c +++ b/libempathy-gtk/empathy-contact-list-store.c @@ -35,6 +35,7 @@ #include "empathy-contact-list-store.h" #include "empathy-contact-groups.h" #include "empathy-ui-utils.h" +#include "empathy-gtk-enum-types.h" #define DEBUG_DOMAIN "ContactListStore" @@ -157,28 +158,6 @@ enum { PROP_SORT_CRITERIUM }; -GType -empathy_contact_list_store_sort_get_type (void) -{ - static GType etype = 0; - - if (etype == 0) { - static const GEnumValue values[] = { - { EMPATHY_CONTACT_LIST_STORE_SORT_NAME, - "EMPATHY_CONTACT_LIST_STORE_SORT_NAME", - "name" }, - { EMPATHY_CONTACT_LIST_STORE_SORT_STATE, - "EMPATHY_CONTACT_LIST_STORE_SORT_STATE", - "state" }, - { 0, NULL, NULL } - }; - - etype = g_enum_register_static ("EmpathyContactListStoreSort", values); - } - - return etype; -} - G_DEFINE_TYPE (EmpathyContactListStore, empathy_contact_list_store, GTK_TYPE_TREE_STORE); static void |