diff options
22 files changed, 145 insertions, 244 deletions
diff --git a/configure.ac b/configure.ac index 1d0c5b13e..3ed951659 100644 --- a/configure.ac +++ b/configure.ac @@ -73,7 +73,6 @@ PKG_CHECK_MODULES(LIBEMPATHY, [ glib-2.0 >= $GLIB_REQUIRED gobject-2.0 - gconf-2.0 >= $GCONF_REQUIRED libxml-2.0 libtelepathy >= $TELEPATHY_REQUIRED telepathy-glib >= $TELEPATHY_GLIB_REQUIRED diff --git a/docs/libempathy-gtk/libempathy-gtk-docs.sgml b/docs/libempathy-gtk/libempathy-gtk-docs.sgml index df56e2784..774f05146 100644 --- a/docs/libempathy-gtk/libempathy-gtk-docs.sgml +++ b/docs/libempathy-gtk/libempathy-gtk-docs.sgml @@ -33,6 +33,7 @@ <xi:include href="xml/empathy-chat.xml"/> <xi:include href="xml/empathy-chat-view.xml"/> <xi:include href="xml/empathy-chat-window.xml"/> + <xi:include href="xml/empathy-conf.xml"/> <xi:include href="xml/empathy-contact-dialogs.xml"/> <xi:include href="xml/empathy-contact-list-store.xml"/> <xi:include href="xml/empathy-contact-list-view.xml"/> diff --git a/docs/libempathy/libempathy-docs.sgml b/docs/libempathy/libempathy-docs.sgml index 5aa6819d1..bcdc5d0ff 100644 --- a/docs/libempathy/libempathy-docs.sgml +++ b/docs/libempathy/libempathy-docs.sgml @@ -20,7 +20,6 @@ <xi:include href="xml/empathy-chandler.xml"/> <xi:include href="xml/empathy-chatroom-manager.xml"/> <xi:include href="xml/empathy-chatroom.xml"/> - <xi:include href="xml/empathy-conf.xml"/> <xi:include href="xml/empathy-contact-factory.xml"/> <xi:include href="xml/empathy-contact-groups.xml"/> <xi:include href="xml/empathy-contact-list.xml"/> diff --git a/libempathy-gtk/Makefile.am b/libempathy-gtk/Makefile.am index 721bd82e2..083065f81 100644 --- a/libempathy-gtk/Makefile.am +++ b/libempathy-gtk/Makefile.am @@ -15,6 +15,7 @@ libempathy_gtk_la_SOURCES = \ ephy-spinner.c ephy-spinner.h \ empathy-main-window.c \ empathy-status-icon.c \ + empathy-conf.c \ empathy-contact-widget.c \ empathy-contact-dialogs.c \ empathy-accounts-dialog.c \ @@ -69,6 +70,7 @@ libempathy_gtk_headers = \ empathy-images.h \ empathy-main-window.h \ empathy-status-icon.h \ + empathy-conf.h \ empathy-contact-widget.h \ empathy-contact-dialogs.h \ empathy-accounts-dialog.h \ diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 348186a6c..ba557787c 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -30,9 +30,10 @@ #include <libgnomevfs/gnome-vfs-ops.h> #include <libempathy/empathy-debug.h> -#include <libempathy/empathy-conf.h> + #include "empathy-avatar-chooser.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-chat-view.c b/libempathy-gtk/empathy-chat-view.c index d6c85606f..f4ad7f316 100644 --- a/libempathy-gtk/empathy-chat-view.c +++ b/libempathy-gtk/empathy-chat-view.c @@ -44,10 +44,10 @@ #include <libempathy/empathy-utils.h> #include <libempathy/empathy-debug.h> -#include <libempathy/empathy-conf.h> #include "empathy-chat-view.h" #include "empathy-chat.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-theme-manager.h" #include "empathy-ui-utils.h" diff --git a/libempathy-gtk/empathy-chat-window.c b/libempathy-gtk/empathy-chat-window.c index b6409f6a8..5acddc1e6 100644 --- a/libempathy-gtk/empathy-chat-window.c +++ b/libempathy-gtk/empathy-chat-window.c @@ -43,7 +43,6 @@ #include <libempathy/empathy-contact.h> #include <libempathy/empathy-debug.h> #include <libempathy/empathy-message.h> -#include <libempathy/empathy-conf.h> #include <libempathy/empathy-utils.h> #include "empathy-chat-window.h" @@ -52,6 +51,7 @@ #include "empathy-contact-dialogs.h" #include "empathy-log-window.h" #include "empathy-new-chatroom-dialog.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-private-chat.h" #include "empathy-group-chat.h" diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index d07b84b07..fbdf6df44 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -40,12 +40,12 @@ #include <libempathy/empathy-log-manager.h> #include <libempathy/empathy-debug.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-conf.h> #include <libempathy/empathy-marshal.h> #include "empathy-chat.h" #include "empathy-chat-window.h" #include "empathy-geometry.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-spell.h" #include "empathy-spell-dialog.h" diff --git a/libempathy/empathy-conf.c b/libempathy-gtk/empathy-conf.c index 71e520f72..1ec3feeb4 100644 --- a/libempathy/empathy-conf.c +++ b/libempathy-gtk/empathy-conf.c @@ -26,13 +26,14 @@ #include <gconf/gconf-client.h> +#include <libempathy/empathy-debug.h> + #include "empathy-conf.h" -#include "empathy-debug.h" #define DEBUG_DOMAIN "Config" #define EMPATHY_CONF_ROOT "/apps/empathy" -#define DESKTOP_INTERFACE_ROOT "/desktop/gnome/interface" +#define DESKTOP_INTERFACE_ROOT "/desktop/gnome/interface" #define GET_PRIV(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), EMPATHY_TYPE_CONF, EmpathyConfPriv)) diff --git a/libempathy/empathy-conf.h b/libempathy-gtk/empathy-conf.h index 7e8e60e25..7e8e60e25 100644 --- a/libempathy/empathy-conf.h +++ b/libempathy-gtk/empathy-conf.h diff --git a/libempathy-gtk/empathy-group-chat.c b/libempathy-gtk/empathy-group-chat.c index 534f66c27..4f86ef2ba 100644 --- a/libempathy-gtk/empathy-group-chat.c +++ b/libempathy-gtk/empathy-group-chat.c @@ -40,7 +40,6 @@ #include <libempathy/empathy-contact.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-debug.h> -#include <libempathy/empathy-conf.h> #include "empathy-group-chat.h" #include "empathy-chat.h" @@ -51,6 +50,7 @@ //#include "empathy-sound.h" #include "empathy-images.h" #include "empathy-ui-utils.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #define DEBUG_DOMAIN "GroupChat" diff --git a/libempathy-gtk/empathy-main-window.c b/libempathy-gtk/empathy-main-window.c index 6b51eccad..951b80e95 100644 --- a/libempathy-gtk/empathy-main-window.c +++ b/libempathy-gtk/empathy-main-window.c @@ -28,7 +28,6 @@ #include <glade/glade.h> #include <glib/gi18n.h> -#include <libempathy/empathy-conf.h> #include <libempathy/empathy-contact.h> #include <libempathy/empathy-debug.h> #include <libempathy/empathy-utils.h> @@ -47,6 +46,7 @@ #include "empathy-presence-chooser.h" #include "empathy-ui-utils.h" #include "empathy-geometry.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-accounts-dialog.h" #include "empathy-about-dialog.h" diff --git a/libempathy-gtk/empathy-preferences.c b/libempathy-gtk/empathy-preferences.c index d6e21a733..50c9d5660 100644 --- a/libempathy-gtk/empathy-preferences.c +++ b/libempathy-gtk/empathy-preferences.c @@ -30,8 +30,7 @@ #include <glade/glade.h> #include <glib/gi18n.h> -#include <libempathy/empathy-conf.h> - +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-ui-utils.h" #include "empathy-theme-manager.h" diff --git a/libempathy-gtk/empathy-spell.c b/libempathy-gtk/empathy-spell.c index 88696cca3..b6620118a 100644 --- a/libempathy-gtk/empathy-spell.c +++ b/libempathy-gtk/empathy-spell.c @@ -33,9 +33,9 @@ #endif #include <libempathy/empathy-debug.h> -#include <libempathy/empathy-conf.h> #include "empathy-spell.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #define DEBUG_DOMAIN "Spell" diff --git a/libempathy-gtk/empathy-status-icon.c b/libempathy-gtk/empathy-status-icon.c index 24132e655..9e62a1e18 100644 --- a/libempathy-gtk/empathy-status-icon.c +++ b/libempathy-gtk/empathy-status-icon.c @@ -35,13 +35,13 @@ #include <libempathy/empathy-tp-chat.h> #include <libempathy/empathy-debug.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-conf.h> #include <libempathy/empathy-idle.h> #include <libempathy/empathy-filter.h> #include "empathy-status-icon.h" #include "empathy-contact-dialogs.h" #include "empathy-presence-chooser.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-ui-utils.h" #include "empathy-accounts-dialog.h" diff --git a/libempathy-gtk/empathy-theme-manager.c b/libempathy-gtk/empathy-theme-manager.c index 6bece7506..94276c964 100644 --- a/libempathy-gtk/empathy-theme-manager.c +++ b/libempathy-gtk/empathy-theme-manager.c @@ -26,9 +26,9 @@ #include <gtk/gtk.h> #include <libempathy/empathy-utils.h> -#include <libempathy/empathy-conf.h> #include "empathy-chat-view.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-theme.h" #include "empathy-theme-boxes.h" diff --git a/libempathy-gtk/empathy-theme.c b/libempathy-gtk/empathy-theme.c index 1895b8ccb..c8a9a0d48 100644 --- a/libempathy-gtk/empathy-theme.c +++ b/libempathy-gtk/empathy-theme.c @@ -24,12 +24,12 @@ #include <glib/gi18n.h> #include <gtk/gtk.h> -#include <libempathy/empathy-conf.h> #include <libempathy/empathy-debug.h> #include <libempathy/empathy-utils.h> #include <libempathy/empathy-marshal.h> #include "empathy-chat.h" +#include "empathy-conf.h" #include "empathy-preferences.h" #include "empathy-theme.h" #include "empathy-smiley-manager.h" diff --git a/libempathy/Makefile.am b/libempathy/Makefile.am index e6711c3c6..285dff185 100644 --- a/libempathy/Makefile.am +++ b/libempathy/Makefile.am @@ -16,7 +16,6 @@ BUILT_SOURCES = \ lib_LTLIBRARIES = libempathy.la libempathy_la_SOURCES = \ - empathy-conf.c \ empathy-avatar.c \ empathy-time.c \ empathy-presence.c \ @@ -54,7 +53,6 @@ libempathy_la_LDFLAGS = \ -version-info ${LIBEMPATHY_CURRENT}:${LIBEMPATHY_REVISION}:${LIBEMPATHY_AGE} libempathy_headers = \ - empathy-conf.h \ empathy-avatar.h \ empathy-time.h \ empathy-presence.h \ diff --git a/python/pyempathy/pyempathy.defs b/python/pyempathy/pyempathy.defs index d98f2605f..f6c7e0b80 100644 --- a/python/pyempathy/pyempathy.defs +++ b/python/pyempathy/pyempathy.defs @@ -21,13 +21,6 @@ (gtype-id "EMPATHY_TYPE_CHATROOM_MANAGER") ) -(define-object Conf - (in-module "Empathy") - (parent "GObject") - (c-name "EmpathyConf") - (gtype-id "EMPATHY_TYPE_CONF") -) - (define-object Contact (in-module "Empathy") (parent "GObject") @@ -233,23 +226,6 @@ -;; From empathy-chandler-glue.h - -(define-function dbus_glib_marshal_empathy_chandler_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_POINTER - (c-name "dbus_glib_marshal_empathy_chandler_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_POINTER") - (return-type "none") - (parameters - '("GClosure*" "closure") - '("GValue*-return_value" "G_GNUC_UNUSED") - '("guint" "n_param_values") - '("const-GValue*" "param_values") - '("gpointer-invocation_hint" "G_GNUC_UNUSED") - '("gpointer" "marshal_data") - ) -) - - - ;; From empathy-chandler.h (define-function empathy_chandler_get_type @@ -435,125 +411,6 @@ -;; From empathy-conf.h - -(define-function empathy_conf_get_type - (c-name "empathy_conf_get_type") - (return-type "GType") -) - -(define-function empathy_conf_get - (c-name "empathy_conf_get") - (return-type "EmpathyConf*") -) - -(define-function empathy_conf_shutdown - (c-name "empathy_conf_shutdown") - (return-type "none") -) - -(define-method notify_add - (of-object "EmpathyConf") - (c-name "empathy_conf_notify_add") - (return-type "guint") - (parameters - '("const-gchar*" "key") - '("EmpathyConfNotifyFunc" "func") - '("gpointer" "data") - ) -) - -(define-method notify_remove - (of-object "EmpathyConf") - (c-name "empathy_conf_notify_remove") - (return-type "gboolean") - (parameters - '("guint" "id") - ) -) - -(define-method set_int - (of-object "EmpathyConf") - (c-name "empathy_conf_set_int") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("gint" "value") - ) -) - -(define-method get_int - (of-object "EmpathyConf") - (c-name "empathy_conf_get_int") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("gint*" "value") - ) -) - -(define-method set_bool - (of-object "EmpathyConf") - (c-name "empathy_conf_set_bool") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("gboolean" "value") - ) -) - -(define-method get_bool - (of-object "EmpathyConf") - (c-name "empathy_conf_get_bool") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("gboolean*" "value") - ) -) - -(define-method set_string - (of-object "EmpathyConf") - (c-name "empathy_conf_set_string") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("const-gchar*" "value") - ) -) - -(define-method get_string - (of-object "EmpathyConf") - (c-name "empathy_conf_get_string") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("gchar**" "value") - ) -) - -(define-method set_string_list - (of-object "EmpathyConf") - (c-name "empathy_conf_set_string_list") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("GSList*" "value") - ) -) - -(define-method get_string_list - (of-object "EmpathyConf") - (c-name "empathy_conf_get_string_list") - (return-type "gboolean") - (parameters - '("const-gchar*" "key") - '("GSList**" "value") - ) -) - - - ;; From empathy-contact-factory.h (define-function empathy_contact_factory_get_type @@ -977,47 +834,6 @@ -;; From empathy-enum-types.h - -(define-function empathy_reg_ex_type_get_type - (c-name "empathy_reg_ex_type_get_type") - (return-type "GType") -) - -(define-function empathy_message_type_get_type - (c-name "empathy_message_type_get_type") - (return-type "GType") -) - -(define-function empathy_capabilities_get_type - (c-name "empathy_capabilities_get_type") - (return-type "GType") -) - -(define-function empathy_tp_call_status_get_type - (c-name "empathy_tp_call_status_get_type") - (return-type "GType") -) - - - -;; From empathy-filter-glue.h - -(define-function dbus_glib_marshal_empathy_filter_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_UINT_POINTER - (c-name "dbus_glib_marshal_empathy_filter_BOOLEAN__STRING_BOXED_STRING_BOXED_UINT_UINT_UINT_POINTER") - (return-type "none") - (parameters - '("GClosure*" "closure") - '("GValue*-return_value" "G_GNUC_UNUSED") - '("guint" "n_param_values") - '("const-GValue*" "param_values") - '("gpointer-invocation_hint" "G_GNUC_UNUSED") - '("gpointer" "marshal_data") - ) -) - - - ;; From empathy-filter.h (define-function empathy_filter_get_type @@ -1273,10 +1089,6 @@ -;; From empathy-marshal.h - - - ;; From empathy-message.h (define-function empathy_message_get_gtype @@ -2248,10 +2060,6 @@ -;; From stamp-empathy-enum-types.h - - - ;; From tp-stream-engine-gen.h (define-function dbus_g_proxy_begin_call diff --git a/python/pyempathy/pyempathy.override b/python/pyempathy/pyempathy.override index d1f434839..a21700fca 100644 --- a/python/pyempathy/pyempathy.override +++ b/python/pyempathy/pyempathy.override @@ -6,7 +6,6 @@ headers #include "empathy-chandler.h" #include "empathy-chatroom-manager.h" #include "empathy-chatroom.h" -#include "empathy-conf.h" #include "empathy-contact-groups.h" #include "empathy-contact-list.h" #include "empathy-contact-manager.h" diff --git a/python/pyempathygtk/pyempathygtk.defs b/python/pyempathygtk/pyempathygtk.defs index f63e16d4a..a8412437f 100644 --- a/python/pyempathygtk/pyempathygtk.defs +++ b/python/pyempathygtk/pyempathygtk.defs @@ -63,6 +63,13 @@ (gtype-id "EMPATHY_TYPE_CHAT_WINDOW") ) +(define-object Conf + (in-module "Empathy") + (parent "GObject") + (c-name "EmpathyConf") + (gtype-id "EMPATHY_TYPE_CONF") +) + (define-object ContactListStore (in-module "Empathy") (parent "GtkTreeStore") @@ -983,6 +990,125 @@ +;; From empathy-conf.h + +(define-function empathy_conf_get_type + (c-name "empathy_conf_get_type") + (return-type "GType") +) + +(define-function empathy_conf_get + (c-name "empathy_conf_get") + (return-type "EmpathyConf*") +) + +(define-function empathy_conf_shutdown + (c-name "empathy_conf_shutdown") + (return-type "none") +) + +(define-method notify_add + (of-object "EmpathyConf") + (c-name "empathy_conf_notify_add") + (return-type "guint") + (parameters + '("const-gchar*" "key") + '("EmpathyConfNotifyFunc" "func") + '("gpointer" "data") + ) +) + +(define-method notify_remove + (of-object "EmpathyConf") + (c-name "empathy_conf_notify_remove") + (return-type "gboolean") + (parameters + '("guint" "id") + ) +) + +(define-method set_int + (of-object "EmpathyConf") + (c-name "empathy_conf_set_int") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("gint" "value") + ) +) + +(define-method get_int + (of-object "EmpathyConf") + (c-name "empathy_conf_get_int") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("gint*" "value") + ) +) + +(define-method set_bool + (of-object "EmpathyConf") + (c-name "empathy_conf_set_bool") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("gboolean" "value") + ) +) + +(define-method get_bool + (of-object "EmpathyConf") + (c-name "empathy_conf_get_bool") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("gboolean*" "value") + ) +) + +(define-method set_string + (of-object "EmpathyConf") + (c-name "empathy_conf_set_string") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("const-gchar*" "value") + ) +) + +(define-method get_string + (of-object "EmpathyConf") + (c-name "empathy_conf_get_string") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("gchar**" "value") + ) +) + +(define-method set_string_list + (of-object "EmpathyConf") + (c-name "empathy_conf_set_string_list") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("GSList*" "value") + ) +) + +(define-method get_string_list + (of-object "EmpathyConf") + (c-name "empathy_conf_get_string_list") + (return-type "gboolean") + (parameters + '("const-gchar*" "key") + '("GSList**" "value") + ) +) + + + ;; From empathy-contact-dialogs.h (define-function empathy_subscription_dialog_show @@ -1302,35 +1428,6 @@ -;; From empathy-gtk-enum-types.h - -(define-function empathy_contact_widget_flags_get_type - (c-name "empathy_contact_widget_flags_get_type") - (return-type "GType") -) - -(define-function empathy_contact_list_store_sort_get_type - (c-name "empathy_contact_list_store_sort_get_type") - (return-type "GType") -) - -(define-function empathy_contact_list_store_col_get_type - (c-name "empathy_contact_list_store_col_get_type") - (return-type "GType") -) - -(define-function empathy_contact_list_features_get_type - (c-name "empathy_contact_list_features_get_type") - (return-type "GType") -) - -(define-function empathy_chat_view_block_get_type - (c-name "empathy_chat_view_block_get_type") - (return-type "GType") -) - - - ;; From empathy-images.h @@ -2030,7 +2127,3 @@ ) - -;; From stamp-empathy-gtk-enum-types.h - - diff --git a/python/pyempathygtk/pyempathygtk.override b/python/pyempathygtk/pyempathygtk.override index f15151762..26eb10119 100644 --- a/python/pyempathygtk/pyempathygtk.override +++ b/python/pyempathygtk/pyempathygtk.override @@ -17,6 +17,7 @@ headers #include "empathy-chatrooms-window.h" #include "empathy-chat-view.h" #include "empathy-chat-window.h" +#include "empathy-conf.h" #include "empathy-contact-dialogs.h" #include "empathy-contact-list-store.h" #include "empathy-contact-list-view.h" |