Add popup menus to the calendar memopad and taskpad.

Implement support for "hide completed tasks" option (not yet tested).
Flesh out most of the Preferences window.  Still need Certificates page.

svn path=/branches/kill-bonobo/; revision=36701

1 files changed, 58 insertions, 61 deletions

diff --git a/mail/em-network-prefs.h b/mail/em-network-prefs.h
index de0951714f..41b4539608 100644
--- a/mail/em-network-prefs.h
+++ b/mail/em-network-prefs.h
@@ -20,30 +20,37 @@
  *
  */
 
-#ifndef __EM_NETWORK_PREFS_H__
-#define __EM_NETWORK_PREFS_H__
-
-#ifdef __cplusplus
-extern "C" {
-#pragma }
-#endif /* __cplusplus */
+#ifndef EM_NETWORK_PREFS_H
+#define EM_NETWORK_PREFS_H
 
 #include <gtk/gtk.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))
-#define EM_NETWORK_PREFS_CLASS(k)    (G_TYPE_CHECK_CLASS_CAST ((k), EM_NETWORK_PREFS_TYPE, EMNetworkPrefsClass))
-#define EM_IS_NETWORK_PREFS(o)       (G_TYPE_CHECK_INSTANCE_TYPE ((o), EM_NETWORK_PREFS_TYPE))
-#define EM_IS_NETWORK_PREFS_CLASS(k) (G_TYPE_CHECK_CLASS_TYPE ((k), EM_NETWORK_PREFS_TYPE))
+#include <glade/glade.h>
+#include <gconf/gconf-client.h>
+
+/* Standard GObject macros */
+#define EM_TYPE_NETWORK_PREFS \
+	(em_network_prefs_get_type ())
+#define EM_NETWORK_PREFS(obj) \
+	(G_TYPE_CHECK_INSTANCE_CAST \
+	((obj), EM_TYPE_NETWORK_PREFS, EMNetworkPrefs))
+#define EM_NETWORK_PREFS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_CAST \
+	((cls), EM_TYPE_NETWORK_PREFS, EMNetworkPrefsClass))
+#define EM_IS_NETWORK_PREFS(obj) \
+	(G_TYPE_CHECK_INSTANCE_TYPE \
+	((obj), EM_TYPE_NETWORK_PREFS))
+#define EM_IS_NETWORK_PREFS_CLASS(cls) \
+	(G_TYPE_CHECK_CLASS_TYPE \
+	((cls), EM_TYPE_NETWORK_PREFS))
+#define EM_NETWORK_PREFS_GET_CLASS(obj) \
+	(G_TYPE_INSTANCE_GET_CLASS \
+	((obj), EM_TYPE_NETWORK_PREFS, EMNetworkPrefsClass))
+
+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,
@@ -51,60 +58,50 @@ typedef enum {
 	NETWORK_PROXY_AUTOCONFIG
 } NetworkConfigProxyType;
 
-
 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;
-	struct _GtkToggleButton *auto_proxy;
-	struct _GtkToggleButton *use_auth;
-
-	struct _GtkEntry *http_host;
-	struct _GtkEntry *https_host;
-	struct _GtkEntry *socks_host;
-	struct _GtkEntry *ignore_hosts;
-	struct _GtkEntry *auto_proxy_url;
-	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_socks_host;
-	struct _GtkLabel *lbl_socks_port;	
-	struct _GtkLabel *lbl_ignore_hosts;
-	struct _GtkLabel *lbl_auth_user;
-	struct _GtkLabel *lbl_auth_pwd;
-
-	struct _GtkSpinButton *http_port;
-	struct _GtkSpinButton *https_port;
-	struct _GtkSpinButton *socks_port;	
+	GtkToggleButton *sys_proxy;
+	GtkToggleButton *no_proxy;
+	GtkToggleButton *manual_proxy;
+	GtkToggleButton *auto_proxy;
+	GtkToggleButton *use_auth;
+
+	GtkEntry *http_host;
+	GtkEntry *https_host;
+	GtkEntry *socks_host;
+	GtkEntry *ignore_hosts;
+	GtkEntry *auto_proxy_url;
+	GtkEntry *auth_user;
+	GtkEntry *auth_pwd;
+
+	GtkLabel *lbl_http_host;
+	GtkLabel *lbl_http_port;
+	GtkLabel *lbl_https_host;
+	GtkLabel *lbl_https_port;
+	GtkLabel *lbl_socks_host;
+	GtkLabel *lbl_socks_port;	
+	GtkLabel *lbl_ignore_hosts;
+	GtkLabel *lbl_auth_user;
+	GtkLabel *lbl_auth_pwd;
+
+	GtkSpinButton *http_port;
+	GtkSpinButton *https_port;
+	GtkSpinButton *socks_port;	
 };
 
 struct _EMNetworkPrefsClass {
 	GtkVBoxClass parent_class;
-	
-	/* signals */
-	
 };
 
-GType em_network_prefs_get_type (void);
-
-struct _GtkWidget *em_network_prefs_new (void);
-
-/* needed by global config */
-#define EM_NETWORK_PREFS_CONTROL_ID "OAFIID:GNOME_Evolution_Mail_NetworkPrefs_ConfigControl:" BASE_VERSION
+GType		em_network_prefs_get_type	(void);
+GtkWidget *	em_network_prefs_new		(void);
 
-#ifdef __cplusplus
-}
-#endif /* __cplusplus */
+G_END_DECLS
 
-#endif /* __EM_NETWORK_PREFS_H__ */
+#endif /* EM_NETWORK_PREFS_H */