diff options
author | Matthew Barnes <mbarnes@redhat.com> | 2009-06-19 03:26:21 +0800 |
---|---|---|
committer | Matthew Barnes <mbarnes@redhat.com> | 2009-06-19 03:26:21 +0800 |
commit | 547e123d2777bd3beba36e74e018efb590ed44d4 (patch) | |
tree | 447712a20cff8bc89e6d6c1d16f0d99b9c1122f5 /mail/em-network-prefs.h | |
parent | 67159043da2de9df576f6a4eaa245e0c3926f004 (diff) | |
download | gsoc2013-evolution-547e123d2777bd3beba36e74e018efb590ed44d4.tar gsoc2013-evolution-547e123d2777bd3beba36e74e018efb590ed44d4.tar.gz gsoc2013-evolution-547e123d2777bd3beba36e74e018efb590ed44d4.tar.bz2 gsoc2013-evolution-547e123d2777bd3beba36e74e018efb590ed44d4.tar.lz gsoc2013-evolution-547e123d2777bd3beba36e74e018efb590ed44d4.tar.xz gsoc2013-evolution-547e123d2777bd3beba36e74e018efb590ed44d4.tar.zst gsoc2013-evolution-547e123d2777bd3beba36e74e018efb590ed44d4.zip |
Stop abusing forward declarations.
Diffstat (limited to 'mail/em-network-prefs.h')
-rw-r--r-- | mail/em-network-prefs.h | 65 |
1 files changed, 31 insertions, 34 deletions
diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h index 79b22c5a92..71031fbe35 100644 --- a/mail/em-network-prefs.h +++ b/mail/em-network-prefs.h @@ -24,6 +24,8 @@ #define __EM_NETWORK_PREFS_H__ #include <gtk/gtk.h> +#include <glade/glade.h> +#include <gconf/gconf-client.h> #define EM_NETWORK_PREFS_TYPE (em_network_prefs_get_type ()) #define EM_NETWORK_PREFS(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), EM_NETWORK_PREFS_TYPE, EMNetworkPrefs)) @@ -36,11 +38,6 @@ G_BEGIN_DECLS typedef struct _EMNetworkPrefs EMNetworkPrefs; typedef struct _EMNetworkPrefsClass EMNetworkPrefsClass; -struct _GtkToggleButton; -struct _GtkEntry; -struct _GladeXML; -struct _GConfClient; - typedef enum { NETWORK_PROXY_SYS_SETTINGS, NETWORK_PROXY_DIRECT_CONNECTION, @@ -52,43 +49,43 @@ typedef enum { struct _EMNetworkPrefs { GtkVBox parent_object; - struct _GConfClient *gconf; + GConfClient *gconf; - struct _GladeXML *gui; + GladeXML *gui; /* Default Behavior */ - struct _GtkToggleButton *sys_proxy; - struct _GtkToggleButton *no_proxy; - struct _GtkToggleButton *manual_proxy; + GtkToggleButton *sys_proxy; + GtkToggleButton *no_proxy; + GtkToggleButton *manual_proxy; #if 0 - struct _GtkToggleButton *auto_proxy; + GtkToggleButton *auto_proxy; #endif - struct _GtkToggleButton *use_auth; + GtkToggleButton *use_auth; - struct _GtkEntry *http_host; - struct _GtkEntry *https_host; - struct _GtkEntry *ignore_hosts; + GtkEntry *http_host; + GtkEntry *https_host; + GtkEntry *ignore_hosts; #if 0 - struct _GtkEntry *auto_proxy_url; + GtkEntry *auto_proxy_url; #endif - struct _GtkEntry *auth_user; - struct _GtkEntry *auth_pwd; - - struct _GtkLabel *lbl_http_host; - struct _GtkLabel *lbl_http_port; - struct _GtkLabel *lbl_https_host; - struct _GtkLabel *lbl_https_port; - struct _GtkLabel *lbl_ignore_hosts; - struct _GtkLabel *lbl_auth_user; - struct _GtkLabel *lbl_auth_pwd; - - struct _GtkSpinButton *http_port; - struct _GtkSpinButton *https_port; + GtkEntry *auth_user; + GtkEntry *auth_pwd; + + GtkLabel *lbl_http_host; + GtkLabel *lbl_http_port; + GtkLabel *lbl_https_host; + GtkLabel *lbl_https_port; + GtkLabel *lbl_ignore_hosts; + GtkLabel *lbl_auth_user; + GtkLabel *lbl_auth_pwd; + + GtkSpinButton *http_port; + GtkSpinButton *https_port; #if 0 - struct _GtkLabel *lbl_socks_host; - struct _GtkEntry *socks_host; - struct _GtkLabel *lbl_socks_port; - struct _GtkSpinButton *socks_port; + GtkLabel *lbl_socks_host; + GtkEntry *socks_host; + GtkLabel *lbl_socks_port; + GtkSpinButton *socks_port; #endif }; @@ -101,7 +98,7 @@ struct _EMNetworkPrefsClass { GType em_network_prefs_get_type (void); -struct _GtkWidget *em_network_prefs_new (void); +GtkWidget *em_network_prefs_new (void); /* needed by global config */ #define EM_NETWORK_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_NetworkPrefs_ConfigControl:" BASE_VERSION |