From c003c99a75587ba39a45d164272760c33f9666b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Fri, 25 Feb 2011 16:20:41 +0100 Subject: Bug #614480 - Avoid using G_TYPE_INSTANCE_GET_PRIVATE repeatedly --- addressbook/gui/widgets/eab-config.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'addressbook/gui/widgets/eab-config.h') diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index fcf6b76f00..ef9bc0752c 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -28,13 +28,20 @@ #include "e-util/e-config.h" +#define EAB_TYPE_CONFIG (eab_config_get_type ()) +#define EAB_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EAB_TYPE_CONFIG, EABConfig)) + + G_BEGIN_DECLS typedef struct _EABConfig EABConfig; typedef struct _EABConfigClass EABConfigClass; +typedef struct _EABConfigPrivate EABConfigPrivate; struct _EABConfig { EConfig config; + + EABConfigPrivate *priv; }; struct _EABConfigClass { -- cgit v1.2.3 From 2c929064fdfe19a1102e51eefc03e4669d3842f4 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Fri, 4 Mar 2011 23:12:09 -0500 Subject: Whitespace cleanup. --- addressbook/gui/widgets/eab-config.h | 1 - 1 file changed, 1 deletion(-) (limited to 'addressbook/gui/widgets/eab-config.h') diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index ef9bc0752c..3c2dabdced 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -31,7 +31,6 @@ #define EAB_TYPE_CONFIG (eab_config_get_type ()) #define EAB_CONFIG(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), EAB_TYPE_CONFIG, EABConfig)) - G_BEGIN_DECLS typedef struct _EABConfig EABConfig; -- cgit v1.2.3 From f043e3c748ad0a6e622b4b37ec990b06770ed75e Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Sat, 28 May 2011 11:12:08 -0400 Subject: Including directly is rarely needed. --- addressbook/gui/widgets/eab-config.h | 2 -- 1 file changed, 2 deletions(-) (limited to 'addressbook/gui/widgets/eab-config.h') diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 3c2dabdced..5aa822ea62 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -24,8 +24,6 @@ #ifndef __EAB_CONFIG_H__ #define __EAB_CONFIG_H__ -#include - #include "e-util/e-config.h" #define EAB_TYPE_CONFIG (eab_config_get_type ()) -- cgit v1.2.3 From 77d14c71c1c4acd82287be23d49e894044af74b5 Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Tue, 9 Aug 2011 17:18:42 +0200 Subject: Bug #655492 - Move 'Automatic contacts' tab to 'Contacts' part --- addressbook/gui/widgets/eab-config.h | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) (limited to 'addressbook/gui/widgets/eab-config.h') diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 5aa822ea62..7cf79244e2 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -24,6 +24,7 @@ #ifndef __EAB_CONFIG_H__ #define __EAB_CONFIG_H__ +#include #include "e-util/e-config.h" #define EAB_TYPE_CONFIG (eab_config_get_type ()) @@ -46,7 +47,8 @@ struct _EABConfigClass { }; enum _eab_config_target_t { - EAB_CONFIG_TARGET_SOURCE + EAB_CONFIG_TARGET_SOURCE, + EAB_CONFIG_TARGET_PREFS }; typedef struct _EABConfigTargetSource EABConfigTargetSource; @@ -57,12 +59,22 @@ struct _EABConfigTargetSource { struct _ESource *source; }; +typedef struct _EABConfigTargetPrefs EABConfigTargetPrefs; + +struct _EABConfigTargetPrefs { + EConfigTarget target; + + /* preferences are global from gconf */ + GConfClient *gconf; +}; + typedef struct _EConfigItem EABConfigItem; GType eab_config_get_type (void); EABConfig *eab_config_new (gint type, const gchar *menuid); EABConfigTargetSource *eab_config_target_new_source (EABConfig *ecp, struct _ESource *source); +EABConfigTargetPrefs *eab_config_target_new_prefs (EABConfig *ecp, GConfClient *gconf); G_END_DECLS -- cgit v1.2.3 From 777c1cbd40eb63365f2c28e38f6a93beb2d1c9d1 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Tue, 16 Aug 2011 11:25:56 -0400 Subject: Coding style and whitespace cleanup. --- addressbook/gui/widgets/eab-config.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'addressbook/gui/widgets/eab-config.h') diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 7cf79244e2..70023360e0 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -25,6 +25,7 @@ #define __EAB_CONFIG_H__ #include +#include #include "e-util/e-config.h" #define EAB_TYPE_CONFIG (eab_config_get_type ()) @@ -56,7 +57,7 @@ typedef struct _EABConfigTargetSource EABConfigTargetSource; struct _EABConfigTargetSource { EConfigTarget target; - struct _ESource *source; + ESource *source; }; typedef struct _EABConfigTargetPrefs EABConfigTargetPrefs; @@ -73,7 +74,7 @@ typedef struct _EConfigItem EABConfigItem; GType eab_config_get_type (void); EABConfig *eab_config_new (gint type, const gchar *menuid); -EABConfigTargetSource *eab_config_target_new_source (EABConfig *ecp, struct _ESource *source); +EABConfigTargetSource *eab_config_target_new_source (EABConfig *ecp, ESource *source); EABConfigTargetPrefs *eab_config_target_new_prefs (EABConfig *ecp, GConfClient *gconf); G_END_DECLS -- cgit v1.2.3 From 4efe4a85d96b9f0c330beb5489c8924f67cdca9f Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 17 Nov 2011 16:04:11 +0100 Subject: Migrate all EABConfig* code to use GSettings --- addressbook/gui/widgets/eab-config.h | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'addressbook/gui/widgets/eab-config.h') diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index 70023360e0..ee99f64626 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -24,7 +24,6 @@ #ifndef __EAB_CONFIG_H__ #define __EAB_CONFIG_H__ -#include #include #include "e-util/e-config.h" @@ -65,8 +64,8 @@ typedef struct _EABConfigTargetPrefs EABConfigTargetPrefs; struct _EABConfigTargetPrefs { EConfigTarget target; - /* preferences are global from gconf */ - GConfClient *gconf; + /* preferences are global from GSettings */ + GSettings *settings; }; typedef struct _EConfigItem EABConfigItem; -- cgit v1.2.3 From ce6762cbde1477e767528c2c704a91539204e6c3 Mon Sep 17 00:00:00 2001 From: Rodrigo Moya Date: Thu, 17 Nov 2011 17:20:39 +0100 Subject: Build fixes --- addressbook/gui/widgets/eab-config.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addressbook/gui/widgets/eab-config.h') diff --git a/addressbook/gui/widgets/eab-config.h b/addressbook/gui/widgets/eab-config.h index ee99f64626..36134c08e7 100644 --- a/addressbook/gui/widgets/eab-config.h +++ b/addressbook/gui/widgets/eab-config.h @@ -74,7 +74,7 @@ GType eab_config_get_type (void); EABConfig *eab_config_new (gint type, const gchar *menuid); EABConfigTargetSource *eab_config_target_new_source (EABConfig *ecp, ESource *source); -EABConfigTargetPrefs *eab_config_target_new_prefs (EABConfig *ecp, GConfClient *gconf); +EABConfigTargetPrefs *eab_config_target_new_prefs (EABConfig *ecp, GSettings *settings); G_END_DECLS -- cgit v1.2.3