Changeset 2485

Timestamp:

07/24/07 23:22:35

Author:

pvanhoof

Message:

Preparing for a release candidate

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/Makefile.am (modified) (1 diff)
• trunk/configure.ac (modified) (6 diffs)
• trunk/libtinymail/tny-account.c (modified) (1 diff)
• trunk/libtinymail/tny-account.h (modified) (3 diffs)
• trunk/libtinymail/tny-enums.h (modified) (8 diffs)
• trunk/libtinymail/tny-error.c (modified) (3 diffs)
• trunk/libtinymail/tny-folder-change.c (modified) (2 diffs)
• trunk/libtinymail/tny-folder-store-change.c (modified) (1 diff)
• trunk/libtinymail/tny-folder-store-query.c (modified) (2 diffs)
• trunk/libtinymail/tny-folder.c (modified) (1 diff)
• trunk/libtinymail/tny-folder.h (modified) (1 diff)
• trunk/libtinymail/tny-header.c (modified) (4 diffs)
• trunk/libtinymail/tny-merge-folder.c (modified) (1 diff)
• trunk/libtinymail/tny-send-queue.c (modified) (1 diff)
• trunk/libtinymail/tny-send-queue.h (modified) (1 diff)
• trunk/libtinymail/tny-status.c (modified) (2 diffs)
• trunk/libtinymail/tny-status.h (modified) (1 diff)
• trunk/libtinymail/tny-store-account.c (modified) (1 diff)
• trunk/libtinymail/tny-store-account.h (modified) (1 diff)

trunk/ChangeLog

@@ +1 @@
+2007-07-24  Philip Van Hoof  <pvanhoof@gnome.org>
+
+        * Preparing for a release candidate
+
-2007-07-23  Murray Cumming  <murrayc@murrayc.com>
-

trunk/Makefile.am

@@ -15 +15 @@
-if BUILD_MOZEMBED
-SUBDIRS += libtinymailui-mozembed 
+endif
+
+if BUILD_WEBKIT
+SUBDIRS += libtinymailui-webkit
-endif
-

trunk/configure.ac

@@ -62 +62 @@
-build_demoui=true
-build_mozembed=true
+build_webkit=false
-build_gtkhtml=false
-build_doxygen=false
@@ -124 +125 @@
-  [Set which html component to use (mozembed, gtkhtml, none)]),
-[case "$with_html_component" in
+  webkit)
+        build_gtkhtml=false
+        build_mozembed=false
+        build_webkit=true
+  ;;
-  mozembed) 
+        build_webkit=false
-        build_mozembed=true
-        build_gtkhtml=false
@@ -130 +137 @@
-  ;;
-  gtkhtml)
+        build_webkit=false
-        build_mozembed=false
-        build_gtkhtml=false
@@ -138 +146 @@
-        build_mozembed=false 
-        build_gtkhtml=false
+        build_webkit=false
-  ;;
-  *) AC_MSG_ERROR(bad value ${with_html_component} for --with-html-component) ;;
-
+
+
-        build_gtkhtml=false
-        with_html_component=mozembed])
@@ -146 +156 @@
-AM_CONDITIONAL(BUILD_MOZEMBED, test x$build_mozembed = xtrue)
-AM_CONDITIONAL(BUILD_GTKHTML, test x$build_gtkhtml = xtrue)
+AM_CONDITIONAL(BUILD_WEBKIT, test x$build_webkit = xtrue)
-
-dnl ### Enable demoui ##
@@ -505 +516 @@
-libtinymailui-gtk/Makefile
-libtinymailui-gtk/libtinymailui-gtk.pc
+libtinymailui-webkit/Makefile
+libtinymailui-webkit/libtinymailui-webkit.pc
-libtinymailui-mozembed/Makefile
-libtinymailui-mozembed/libtinymailui-mozembed.pc

trunk/libtinymail/tny-account.c

@@ -967 +967 @@
-
-
+
+/**
+ * tny_account_signal_type_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_account_signal_type_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_ACCOUNT_CONNECTION_STATUS_CHANGED, "TNY_ACCOUNT_CONNECTION_STATUS_CHANGED", "connection_status" },
+      { TNY_ACCOUNT_LAST_SIGNAL, "TNY_ACCOUNT_LAST_SIGNAL", "last_signal" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyAccountSignal", values);
+  }
+  return etype;
+}
+
-/**
- * tny_connection_status_get_type:

trunk/libtinymail/tny-account.h

@@ -33 +33 @@
-#define TNY_ACCOUNT_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), TNY_TYPE_ACCOUNT, TnyAccountIface))
-
-#define TNY_TYPE_ACCOUNT_TYPE (tny_account_type_get_type())
-
-#ifndef TNY_SHARED_H
-typedef enum _TnyAccountType TnyAccountType;
@@ -55 +53 @@
-};
-
+#define TNY_TYPE_ACCOUNT_TYPE (tny_account_type_get_type())
+
-enum _TnyAccountType
-{
@@ -61 +61 @@
-        TNY_ACCOUNT_TYPE_COMBINED
-};
+
+#define TNY_TYPE_ACCOUNT_SIGNAL (tny_account_signal_type_get_type())
-
-enum _TnyAccountSignal

trunk/libtinymail/tny-enums.h

@@ -24 +24 @@
-        TNY_GET_SUPPORTED_SECURE_AUTH_STATUS_GET_SECURE_AUTH = 6,
-        TNY_FOLDER_STATUS_CODE_SYNC = 7,
-
-} TnyStatusCode;
-
@@ -43 +42 @@
-        TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT = 1<<1,
-        TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS = 1<<2,
-
-
+
+
+
-} TnyFolderChangeChanged;
-
-typedef enum {
-{
-        TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS = 1<<0,
-        TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS = 1<<1
@@ -58 +57 @@
-        TNY_TRANSPORT_ACCOUNT_ERROR = 3,
-        TNY_ACCOUNT_ERROR = 4,
-
+
+
-} TnyErrorDomain;
-
@@ -97 +97 @@
-
-        TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT = 18,
-
-
-} TnyError;
-
@@ -106 +104 @@
-        TNY_ACCOUNT_TYPE_COMBINED
-} TnyAccountType;
+
+typedef enum
+{
+        TNY_ACCOUNT_CONNECTION_STATUS_CHANGED,
+        TNY_ACCOUNT_LAST_SIGNAL
+} TnyAccountSignal;
+
-
-typedef enum {
@@ -122 +127 @@
-        TNY_ACCOUNT_STORE_ACCOUNT_REMOVED,
-        TNY_ACCOUNT_STORE_ACCOUNTS_RELOADED,
+        TNY_ACCOUNT_STORE_CONNECTING_STARTED,
+        TNY_ACCOUNT_STORE_CONNECTING_FINISHED,
-        TNY_ACCOUNT_STORE_LAST_SIGNAL
-} TnyAccountStoreSignal;
@@ -172 +179 @@
-        TNY_HEADER_FLAG_HIGH_PRIORITY = 1<<9|1<<10,
-        TNY_HEADER_FLAG_NORMAL_PRIORITY = 0<<9|0<<10,
-
+
+
-} TnyHeaderPriorityFlags;
-
@@ -190 +198 @@
-        TNY_FOLDER_TYPE_ARCHIVE,
-        TNY_FOLDER_TYPE_MERGE,
-
-        TNY_FOLDER_TYPE_NUM
-} TnyFolderType;
-
+
+typedef enum 
+{
+        TNY_SEND_QUEUE_MSG_SENDING,
+        TNY_SEND_QUEUE_MSG_SENT,
+        TNY_SEND_QUEUE_ERROR_HAPPENED,
+        TNY_SEND_QUEUE_LAST_SIGNAL
+} TnySendQueueSignal;
+
+
+typedef enum
+{
+        TNY_STORE_ACCOUNT_SUBSCRIPTION_CHANGED,
+        TNY_STORE_ACCOUNT_LAST_SIGNAL
+} TnyStoreAccountSignal;
+
-G_END_DECLS
-

trunk/libtinymail/tny-error.c

@@ -40 +40 @@
-      { TNY_TRANSPORT_ACCOUNT_ERROR, "TNY_TRANSPORT_ACCOUNT_ERROR", "transport_account_error" },
-      { TNY_ACCOUNT_ERROR, "TNY_ACCOUNT_ERROR", "account_error" },
+      { TNY_ACCOUNT_STORE_ERROR, "TNY_ACCOUNT_STORE_ERROR", "account_store_error" },
-      { TNY_SEND_QUEUE_ERROR, "TNY_SEND_QUEUE_ERROR", "send_queue_error" },
-
-      { 0, NULL, NULL }
-    };
@@ -63 +63 @@
-  if (etype == 0) {
-    static const GEnumValue values[] = {
+
+
+
+
-      { TNY_ERROR_UNSPEC, "TNY_ERROR_UNSPEC", "error_unspec" },
-      { TNY_FOLDER_ERROR_SYNC, "TNY_FOLDER_ERROR_SYNC", "folder_error_sync" },
@@ -93 +97 @@
-
-      { TNY_SEND_QUEUE_ERROR_ADD, "TNY_SEND_QUEUE_ERROR_ADD", "send_queue_error_add"},
+
+      { TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT, "TNY_ACCOUNT_STORE_ERROR_CANCEL_ALERT", "account_store_cancel_alert"},
+      { TNY_ACCOUNT_ERROR_GET_SUPPORTED_AUTH, "TNY_ACCOUNT_ERROR_GET_SUPPORTED_AUTH", "account_get_supported_auth"},
+
-      { 0, NULL, NULL }
-    };

trunk/libtinymail/tny-folder-change.c

@@ -545 +545 @@
-  static GType etype = 0;
-  if (etype == 0) {
-Enum
+Flags
-      { TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT, "TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT", "all-count" },
-      { TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT, "TNY_FOLDER_CHANGE_CHANGED_UNREAD_COUNT", "unread-count" },
@@ -554 +554 @@
-      { 0, NULL, NULL }
-    };
-enum
+flags
-  }
-  return etype;

trunk/libtinymail/tny-folder-store-change.c

@@ -361 +361 @@
-  static GType etype = 0;
-  if (etype == 0) {
-Enum
+Flags
-      { TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS, "TNY_FOLDER_STORE_CHANGE_CHANGED_CREATED_FOLDERS", "created-folders" },
-      { TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS, "TNY_FOLDER_STORE_CHANGE_CHANGED_REMOVED_FOLDERS", "removed-folders" },
-      { 0, NULL, NULL }
-    };
-enum
+flags
-  }
-  return etype;

trunk/libtinymail/tny-folder-store-query.c

@@ -326 +326 @@
-  static GType etype = 0;
-  if (etype == 0) {
-Enum
+Flags
-      { TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED, "TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED", "subscribed" },
-      { TNY_FOLDER_STORE_QUERY_OPTION_UNSUBSCRIBED, "TNY_FOLDER_STORE_QUERY_OPTION_UNSUBSCRIBED", "unsubscribed" },
@@ -333 +333 @@
-      { 0, NULL, NULL }
-    };
-enum
+flags
-  }
-  return etype;

trunk/libtinymail/tny-folder.c

@@ -1396 +1396 @@
-  static GType etype = 0;
-  if (etype == 0) {
-Enum
+Flags
-      { TNY_FOLDER_CAPS_WRITABLE, "TNY_FOLDER_CAPS_WRITABLE", "writable" },
-
+ 
-      { 0, NULL, NULL }
-    };
-enum
+flags
-  }
-  return etype;

trunk/libtinymail/tny-folder.h

@@ -81 +81 @@
-        TNY_FOLDER_TYPE_ARCHIVE,
-        TNY_FOLDER_TYPE_MERGE,
-
-        TNY_FOLDER_TYPE_NUM
-};

trunk/libtinymail/tny-header.c

@@ -572 +572 @@
-  static GType etype = 0;
-  if (etype == 0) {
-Enum
+Flags
-      { TNY_HEADER_FLAG_ANSWERED, "TNY_HEADER_FLAG_ANSWERED", "answered" },
-      { TNY_HEADER_FLAG_DELETED, "TNY_HEADER_FLAG_DELETED", "deleted" },
@@ -585 +585 @@
-      { 0, NULL, NULL }
-    };
-enum
+flags
-  }
-  return etype;
@@ -603 +603 @@
-  static GType etype = 0;
-  if (etype == 0) {
-Enum
+Flags
-      { TNY_HEADER_FLAG_HIGH_PRIORITY, "TNY_HEADER_FLAG_HIGH_PRIORITY", "high-priority" },
-      { TNY_HEADER_FLAG_NORMAL_PRIORITY, "TNY_HEADER_FLAG_NORMAL_PRIORITY", "normal-priority" },
@@ -610 +610 @@
-      { 0, NULL, NULL }
-    };
-enum
+flags
-  }
-  return etype;

trunk/libtinymail/tny-merge-folder.c

@@ -19 +19 @@
-
-#include <config.h>
+#include <string.h>
-#include <glib.h>
-#include <glib/gi18n-lib.h>

trunk/libtinymail/tny-send-queue.c

@@ -233 +233 @@
-}
-
+/**
+ * tny_send_queue_signal_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_send_queue_signal_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_SEND_QUEUE_MSG_SENDING, "TNY_SEND_QUEUE_MSG_SENDING", "msg-sending" },
+      { TNY_SEND_QUEUE_MSG_SENT, "TNY_SEND_QUEUE_MSG_SENT", "msg-sent" },
+      { TNY_SEND_QUEUE_ERROR_HAPPENED, "TNY_SEND_QUEUE_ERROR_HAPPENED", "error-happened" },
+      { TNY_SEND_QUEUE_LAST_SIGNAL, "TNY_SEND_QUEUE_LAST_SIGNAL", "last-signal" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnySendQueueSignal", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-send-queue.h

@@ -39 +39 @@
-#endif
-
+#define TNY_TYPE_SEND_QUEUE_SIGNAL (tny_send_queue_signal_get_type ())
+
-enum _TnySendQueueSignal
-{

trunk/libtinymail/tny-status.c

@@ -22 +22 @@
-#include <tny-status.h>
-
-/**
- * tny_status_domain_get_type:
- *
- * GType system helper function
- *
- * Return value: a GType
- **/
-GType
-tny_status_domain_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { TNY_FOLDER_STATUS, "TNY_FOLDER_STATUS", "folder_status" },
-      { TNY_GET_MSG_QUEUE_STATUS, "TNY_GET_MSG_QUEUE_STATUS", "get_msg_queue_status" },
-
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("TnyStatusDomain", values);
-  }
-  return etype;
-}
-
-
-/**
- * tny_status_code_get_type:
- *
- * GType system helper function
- *
- * Return value: a GType
- **/
-GType
-tny_status_code_get_type (void)
-{
-  static GType etype = 0;
-  if (etype == 0) {
-    static const GEnumValue values[] = {
-      { TNY_FOLDER_STATUS_CODE_REFRESH, "TNY_FOLDER_STATUS_CODE_REFRESH", "folder_status_code_refresh" },
-      { TNY_FOLDER_STATUS_CODE_GET_MSG, "TNY_FOLDER_STATUS_CODE_GET_MSG", "folder_status_code_get_msg" },
-      { TNY_GET_MSG_QUEUE_STATUS_GET_MSG, "TNY_GET_MSG_QUEUE_STATUS_GET_MSG", "get_msg_queue_status_get_msg" },
-      { 0, NULL, NULL }
-    };
-    etype = g_enum_register_static ("TnyStatus", values);
-  }
-  return etype;
-}
-
-/**
@@ -312 +266 @@
- * Return value: the code of @status (as a TnyStatusCode)
- **/
+
+
+/**
+ * tny_status_domain_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_status_domain_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_STATUS, "TNY_FOLDER_STATUS", "folder_status" },
+      { TNY_GET_MSG_QUEUE_STATUS, "TNY_GET_MSG_QUEUE_STATUS", "get_msg_queue_status" },
+      { TNY_GET_SUPPORTED_SECURE_AUTH_STATUS, "TNY_GET_SUPPORTED_SECURE_AUTH_STATUS", "secured-auth-status" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyStatusDomain", values);
+  }
+  return etype;
+}
+
+
+/**
+ * tny_status_code_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_status_code_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_FOLDER_STATUS_CODE_REFRESH, "TNY_FOLDER_STATUS_CODE_REFRESH", "folder_status_code_refresh" },
+      { TNY_FOLDER_STATUS_CODE_GET_MSG, "TNY_FOLDER_STATUS_CODE_GET_MSG", "folder_status_code_get_msg" },
+      { TNY_GET_MSG_QUEUE_STATUS_GET_MSG, "TNY_GET_MSG_QUEUE_STATUS_GET_MSG", "get_msg_queue_status_get_msg" },
+      { TNY_FOLDER_STATUS_CODE_XFER_MSGS, "TNY_FOLDER_STATUS_CODE_XFER_MSGS", "xfer-msgs" },
+      { TNY_FOLDER_STATUS_CODE_COPY_FOLDER, "TNY_FOLDER_STATUS_CODE_COPY_FOLDER", "copy-folder" },
+      { TNY_GET_SUPPORTED_SECURE_AUTH_STATUS_GET_SECURE_AUTH, "TNY_GET_SUPPORTED_SECURE_AUTH_STATUS_GET_SECURE_AUTH", "get-secure-auth" },
+      { TNY_FOLDER_STATUS_CODE_SYNC, "TNY_FOLDER_STATUS_CODE_SYNC", "code-sync" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyStatusCode", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-status.h

@@ -25 +25 @@
-#include <tny-shared.h>
-
-#define TNY_TYPE_STATUS_DOMAIN (tny_status_domain_get_type())
-
-#ifndef TNY_SHARED_H
-typedef struct _TnyStatus TnyStatus;
-#endif
+
+#define TNY_TYPE_STATUS_DOMAIN (tny_status_domain_get_type())
-
-enum _TnyStatusDomain

trunk/libtinymail/tny-store-account.c

@@ -209 +209 @@
-        return type;
-}
+
+
+/**
+ * tny_status_code_get_type:
+ *
+ * GType system helper function
+ *
+ * Return value: a GType
+ **/
+GType
+tny_store_account_signal_get_type (void)
+{
+  static GType etype = 0;
+  if (etype == 0) {
+    static const GEnumValue values[] = {
+      { TNY_STORE_ACCOUNT_SUBSCRIPTION_CHANGED, "TNY_STORE_ACCOUNT_SUBSCRIPTION_CHANGED", "subscription_changed" },
+      { TNY_STORE_ACCOUNT_LAST_SIGNAL, "TNY_STORE_ACCOUNT_LAST_SIGNAL", "last-signal" },
+      { 0, NULL, NULL }
+    };
+    etype = g_enum_register_static ("TnyStoreAccountSignal", values);
+  }
+  return etype;
+}

trunk/libtinymail/tny-store-account.h

@@ -35 +35 @@
-#define TNY_IS_STORE_ACCOUNT(obj)          (G_TYPE_CHECK_INSTANCE_TYPE ((obj), TNY_TYPE_STORE_ACCOUNT))
-#define TNY_STORE_ACCOUNT_GET_IFACE(inst)  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), TNY_TYPE_STORE_ACCOUNT, TnyStoreAccountIface))
+
+#define TNY_TYPE_STORE_ACCOUNT_SIGNAL (tny_store_account_signal_get_type ())
-
-enum _TnyStoreAccountSignal