GNOME.org
 

evolution-scalix r82 - in branches/SCALIX: . camel eplugin libescalix m4 po

Author: grene
Date: Sat Mar  8 14:44:46 2008
New Revision: 82
URL: http://svn.gnome.org/viewvc/evolution-scalix?rev=82&view=rev

Log:
Merge from trunk revision 81

Added:
   branches/SCALIX/po/ca.po
      - copied unchanged from r81, /trunk/po/ca.po
   branches/SCALIX/po/en_GB.po
      - copied unchanged from r81, /trunk/po/en_GB.po
   branches/SCALIX/po/es.po
      - copied unchanged from r81, /trunk/po/es.po
   branches/SCALIX/po/fr.po
      - copied unchanged from r81, /trunk/po/fr.po
   branches/SCALIX/po/oc.po
      - copied unchanged from r81, /trunk/po/oc.po
Modified:
   branches/SCALIX/AUTHORS
   branches/SCALIX/ChangeLog
   branches/SCALIX/MAINTAINERS
   branches/SCALIX/Makefile.am
   branches/SCALIX/camel/camel-scalix-folder.c
   branches/SCALIX/configure.in
   branches/SCALIX/eplugin/ChangeLog
   branches/SCALIX/eplugin/scalix-account-synch.c
   branches/SCALIX/eplugin/scalix-change-password.c
   branches/SCALIX/eplugin/scalix-menus.c
   branches/SCALIX/libescalix/scalix-container.c
   branches/SCALIX/libescalix/scalix-object-cache.c
   branches/SCALIX/m4/intltool.m4
   branches/SCALIX/po/ChangeLog

Modified: branches/SCALIX/AUTHORS
==============================================================================
--- branches/SCALIX/AUTHORS	(original)
+++ branches/SCALIX/AUTHORS	Sat Mar  8 14:44:46 2008
@@ -1,2 +1,4 @@
 Christian Kellner <Christian Kellner scalix com>
-Carsten Guenther <Carsten Guenther scalix com>
+Gren Elliot <Gren Elliot scalix com>
+
+Carsten Guenther

Modified: branches/SCALIX/MAINTAINERS
==============================================================================
--- branches/SCALIX/MAINTAINERS	(original)
+++ branches/SCALIX/MAINTAINERS	Sat Mar  8 14:44:46 2008
@@ -1,2 +1,8 @@
-Christian Kellner <Christian Kellner scalix com>
-Carsten Guenther <Carsten Guenther scalix com>
+Christian Kellner
+E-Mail: gicmo gnome org
+Userid: gicmo
+
+Gren Elliot
+E-Mail: Gren Elliot scalix com
+Userid: grene
+

Modified: branches/SCALIX/Makefile.am
==============================================================================
--- branches/SCALIX/Makefile.am	(original)
+++ branches/SCALIX/Makefile.am	Sat Mar  8 14:44:46 2008
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = glog libescalix camel programs eplugin calendar addressbook po
 

Modified: branches/SCALIX/camel/camel-scalix-folder.c
==============================================================================
--- branches/SCALIX/camel/camel-scalix-folder.c	(original)
+++ branches/SCALIX/camel/camel-scalix-folder.c	Sat Mar  8 14:44:46 2008
@@ -426,7 +426,7 @@
     scalix_folder->cachedir =
         scalix_store_build_filename (store, folder->full_name);
     
-    e_util_mkdir_hier (scalix_folder->cachedir, 0777);
+    g_mkdir_with_parents (scalix_folder->cachedir, 0777);
 
     scalix_folder->cache =
         camel_data_cache_new (scalix_folder->cachedir, 0, NULL);
@@ -1864,7 +1864,7 @@
     cachedir = scalix_store_build_filename (store, folder->full_name);
     g_free (scalix_folder->cachedir);
     scalix_folder->cachedir = cachedir;
-    e_util_mkdir_hier (scalix_folder->cachedir, 0777);
+    g_mkdir_with_parents (scalix_folder->cachedir, 0777);
 
     scalix_folder->cache = camel_data_cache_new (scalix_folder->cachedir,
                                                  0, NULL);

Modified: branches/SCALIX/configure.in
==============================================================================
--- branches/SCALIX/configure.in	(original)
+++ branches/SCALIX/configure.in	Sat Mar  8 14:44:46 2008
@@ -10,7 +10,7 @@
 EVO_REQUIRED_VERSION=2.3.7
 EDS_REQUIRED_VERSION=1.3.7
 SERVER_REQ=10.0.0
-VERSION=11.1.0.0
+VERSION=11.2.1.0
 
 # Required for AX M4 macros to work.
 AC_CONFIG_MACRO_DIR([m4])
@@ -33,19 +33,33 @@
 
 AC_DEFINE_UNQUOTED(SERVER_VERSION_REQ, "$SERVER_REQ", [Minimal server version required])
 
-for version in 2.10 2.8 2.6 2.4; do 
+AC_MSG_CHECKING([Checking for Evolution])
+EVOLUTION_VERSION=`pkg-config --modversion evolution-shell 2>/dev/null`
 
-	AC_MSG_CHECKING([Checking for Evolution version $version])
-	EVOLUTION_VERSION=`pkg-config --modversion evolution-shell-$version 2>/dev/null`
-	
-	if test -z "$EVOLUTION_VERSION"; then
-		AC_MSG_RESULT([not found])
-	else
-		AC_MSG_RESULT([found ($EVOLUTION_VERSION)])
-		break;
-	fi
+if test -n "$EVOLUTION_VERSION"; then
+	# We have 2.12 or greater
+	AC_MSG_RESULT([found ($EVOLUTION_VERSION)])
+	version=`pkg-config --variable=execversion evolution-shell`
+	EVOLUTION_SHELL_PC=evolution-shell
+	EVOLUTION_PLUGIN_PC=evolution-plugin
+else
+	AC_MSG_RESULT([not found])
 
-done
+	# Older versions had versioned pkg-config files
+	for version in 2.10 2.8 2.6 2.4; do 
+		AC_MSG_CHECKING([Checking for Evolution version $version])
+		EVOLUTION_VERSION=`pkg-config --modversion evolution-shell-$version 2>/dev/null`
+	
+		if test -z "$EVOLUTION_VERSION"; then
+			AC_MSG_RESULT([not found])
+		else
+			AC_MSG_RESULT([found ($EVOLUTION_VERSION)])
+			EVOLUTION_SHELL_PC=evolution-shell-$version
+			EVOLUTION_PLUGIN_PC=evolution-plugin-$version
+			break;
+		fi
+	done
+fi
 
 if test -z "$EVOLUTION_VERSION"; then
 	AC_MSG_ERROR([No compatible Evolution version found or missing development headers])
@@ -84,6 +98,13 @@
 	EDS_API_VERSION=1.2
 	;;
 
+	2.12)
+	EVOLUTION_API_VERSION=2.12
+	EAPI_MAJOR_VERSION=2
+	EAPI_MINOR_VERSION=12
+	CAMEL_API_VERSION=1.2
+	EDS_API_VERSION=1.2
+	;;
 
 esac
 
@@ -118,7 +139,7 @@
 dnl i18n 
 dnl ===========================================================================
 
-ALL_LINGUAS="ar de dz sv"
+ALL_LINGUAS="ar ca de dz en_GB es fr oc sv"
 
 AC_PROG_INTLTOOL([0.33])
 AM_GLIB_GNU_GETTEXT
@@ -147,14 +168,14 @@
 AC_SUBST(GTK_LIBS)
 
 dnl === evolution-plugin ==============
-PKG_CHECK_MODULES(EPLUGIN, evolution-plugin-$EVOLUTION_API_VERSION)
+PKG_CHECK_MODULES(EPLUGIN, $EVOLUTION_PLUGIN_PC)
 AC_SUBST(EPLUGIN_CFLAGS)
 AC_SUBST(EPLUGIN_LIBS)
 
-eplugindir=`pkg-config --variable=plugindir evolution-plugin-$EVOLUTION_API_VERSION` 
+eplugindir=`pkg-config --variable=plugindir $EVOLUTION_PLUGIN_PC` 
 AC_SUBST(eplugindir)
 
-eerrordir=`pkg-config --variable=errordir evolution-plugin-$EVOLUTION_API_VERSION`
+eerrordir=`pkg-config --variable=errordir $EVOLUTION_PLUGIN_PC`
 AC_SUBST(eerrordir)
 
 EPLUGIN_RULE=$srcdir/eplugin.mk
@@ -162,7 +183,7 @@
 
 dnl === evolution =====================
 
-EVO_imagesdir="`pkg-config --variable=imagesdir evolution-shell-$EVOLUTION_API_VERSION`"
+EVO_imagesdir="`pkg-config --variable=imagesdir $EVOLUTION_SHELL_PC`"
 AC_SUBST(EVO_imagesdir)
 
 dnl === camel =========================
@@ -193,7 +214,7 @@
 fi
 
 dnl === e-d-s =========================
-PKG_CHECK_MODULES(EDS, evolution-data-server-$EDS_API_VERSION)
+PKG_CHECK_MODULES(EDS, evolution-data-server-$EDS_API_VERSION gconf-2.0)
 AC_SUBST(EDS_CFLAGS)
 AC_SUBST(EDS_LIBS)
 
@@ -213,6 +234,21 @@
 backenddir=`pkg-config --variable=extensiondir evolution-data-server-$EDS_API_VERSION`
 AC_SUBST(backenddir)
 
+dnl === evolution typedef struct _MailMsg MailMsg check ===
+dnl ===    (customisation seen on Fedora 7) ===============
+SAVE_CFLAGS="$CFLAGS"
+CFLAGS="$CFLAGS $EPLUGIN_CFLAGS"
+AC_CACHE_CHECK(for typedef MailMsg in mail/mail-mt.h, ac_cv_typedef_MailMsg,
+	AC_TRY_COMPILE([
+			#include <mail/mail-mt.h>
+			], [
+			MailMsg baseMsg;
+			], ac_cv_typedef_MailMsg=yes, ac_cv_typedef_MailMsg=no))
+if test $ac_cv_typedef_MailMsg = yes; then
+	AC_DEFINE(HAVE_MAILMSG, 1, [Define if mail/mail-mt.h sets up typedef for MailMsg])
+fi
+CFLAGS="$SAVE_CFLAGS"
+
 dnl === libxml ========================
 PKG_CHECK_MODULES(LIBXML, libxml-2.0)
 AC_SUBST(LIBXML_LIBS)

Modified: branches/SCALIX/eplugin/scalix-account-synch.c
==============================================================================
--- branches/SCALIX/eplugin/scalix-account-synch.c	(original)
+++ branches/SCALIX/eplugin/scalix-account-synch.c	Sat Mar  8 14:44:46 2008
@@ -1,6 +1,6 @@
 
 /*
- * Copyright 2005 Scalix, Inc. (www.scalix.com)
+ * Copyright (C) 2005-2007 Scalix, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -18,6 +18,10 @@
  * Authors: Christian Kellner scalix com
  */
 
+/* define "HAVE_MAILMSG" needs to be set if some Fedora modifications
+ * have been made to the evolution code in mail/mail-mt.h
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -574,7 +578,11 @@
 #define MSG_SVER "<span weight=\"light\">Found Server Version: %s</span>"
 
 struct account_synch_msg {
+#ifdef HAVE_MAILMSG
+    MailMsg base;
+#else
     struct _mail_msg msg;
+#endif
     ScalixAccountSynch *sxas;
     char *sversion;
     gboolean success;
@@ -756,11 +764,10 @@
  * logic in it! Big fat beast! Please watch your
  * children ... */
 static void
-synch_worker (struct _mail_msg *mm)
+synch_worker (struct account_synch_msg *m)
 {
     ScalixAccountSynch *sxas;
     ScalixAccountSynchPrivate *priv;
-    struct account_synch_msg *m;
     CamelException ex;
     CamelStore *store;
     CamelFolderInfo *ftree;
@@ -771,7 +778,6 @@
     char *sversion;
     char *markup;
 
-    m = (struct account_synch_msg *) mm;
     sxas = SCALIX_ACCOUNT_SYNCH (m->sxas);
     priv = SCALIX_ACCOUNT_SYNCH_GET_PRIVATE (sxas);
 
@@ -923,11 +929,8 @@
 }
 
 static void
-synch_done (struct _mail_msg *mm)
+synch_done (struct account_synch_msg *m)
 {
-    struct account_synch_msg *m;
-
-    m = (struct account_synch_msg *) mm;
 
     g_print ("SxAS: Emitting finished signal (%d) [%p]\n",
              m->success, g_thread_self ());
@@ -1000,11 +1003,8 @@
 }
 
 static void
-synch_free (struct _mail_msg *mm)
+synch_free (struct account_synch_msg *m)
 {
-    struct account_synch_msg *m;
-
-    m = (struct account_synch_msg *) mm;
 
     g_free (m->sversion);
     g_object_unref (m->sxas);
@@ -1013,13 +1013,55 @@
 
 }
 
+#ifndef HAVE_MAILMSG
+
+static void
+synch_worker_wrap (struct _mail_msg *mm)
+{
+    struct account_synch_msg *m;
+    m = (struct account_synch_msg *) mm;
+    synch_worker (m);
+}
+
+static void
+synch_done_wrap (struct _mail_msg *mm)
+{
+    struct account_synch_msg *m;
+    m = (struct account_synch_msg *) mm;
+    synch_done (m);
+}
+
+static void
+synch_free_wrap (struct _mail_msg *mm)
+{
+    struct account_synch_msg *m;
+    m = (struct account_synch_msg *) mm;
+    synch_free (m);
+}
+
+#endif
+
+#ifdef HAVE_MAILMSG
+
+static MailMsgInfo account_synch_info = {
+    sizeof (struct account_synch_msg),
+    (MailMsgDescFunc) NULL,
+    (MailMsgExecFunc) synch_worker,
+    (MailMsgDoneFunc) synch_done,
+    (MailMsgFreeFunc) synch_free
+};
+
+#else
+
 static struct _mail_msg_op account_synch_op = {
     NULL,
-    synch_worker,
-    synch_done,
-    synch_free,
+    synch_worker_wrap,
+    synch_done_wrap,
+    synch_free_wrap,
 };
 
+#endif
+
 /* ************************************************************************* */
 
 /* Public Interface */
@@ -1040,7 +1082,11 @@
     ScalixAccountSynchPrivate *priv;
     struct account_synch_msg *m;
 
+#ifdef HAVE_MAILMSG
+    m = mail_msg_new (&account_synch_info);
+#else
     m = mail_msg_new (&account_synch_op, NULL, sizeof (*m));
+#endif
 
     if (m == NULL) {
         return FALSE;
@@ -1052,7 +1098,11 @@
     m->success = FALSE;
     m->sversion = NULL;
 
+#ifdef HAVE_MAILMSG
+    mail_msg_unordered_push (m);
+#else
     e_thread_put (mail_thread_new, (EMsg *) m);
+#endif
 
     return TRUE;
 }

Modified: branches/SCALIX/eplugin/scalix-change-password.c
==============================================================================
--- branches/SCALIX/eplugin/scalix-change-password.c	(original)
+++ branches/SCALIX/eplugin/scalix-change-password.c	Sat Mar  8 14:44:46 2008
@@ -1,5 +1,5 @@
 /*
- * Copyright 2005 Scalix, Inc. (www.scalix.com)
+ * Copyright (C) 2005-2007 Scalix, Inc. All rights reserved.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of version 2 of the GNU General Public
@@ -17,6 +17,10 @@
  * Authors: Christian Kellner <Christian Kellner scalix com>
  */
 
+/* define "HAVE_MAILMSG" needs to be set if some Fedora modifications
+ * have been made to the evolution code in mail/mail-mt.h
+ */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -104,7 +108,11 @@
 typedef struct _SxChangePwDialog SxChangePwDialog;
 
 struct sx_change_pw_msg {
+#ifdef HAVE_MAILMSG
+    MailMsg base;
+#else
     struct _mail_msg msg;
+#endif
     char *oldpw;
     char *newpw;
     char *uri;
@@ -130,15 +138,13 @@
 };
 
 static void
-pwchange_worker (struct _mail_msg *mm)
+pwchange_worker (struct sx_change_pw_msg *m)
 {
-    struct sx_change_pw_msg *m;
     SxChangePwDialog *pwd;
     CamelStore *store;
     CamelException *ex;
     GString *pwstr;
 
-    m = (struct sx_change_pw_msg *) mm;
     pwd = m->pwd;
     ex = &(m->ex);
 
@@ -162,13 +168,11 @@
 }
 
 static void
-pwchange_done (struct _mail_msg *mm)
+pwchange_done (struct sx_change_pw_msg *m)
 {
-    struct sx_change_pw_msg *m;
     SxChangePwDialog *pwd;
     char *markup;
 
-    m = (struct sx_change_pw_msg *) mm;
     pwd = m->pwd;
 
     if (m->pwd == NULL) {
@@ -239,24 +243,66 @@
 }
 
 static void
-pwchange_free (struct _mail_msg *mm)
+pwchange_free (struct sx_change_pw_msg *m)
+{
+    g_free (m->oldpw);
+    g_free (m->newpw);
+    g_free (m->uri);
+}
+
+#ifndef HAVE_MAILMSG
+
+static void
+pwchange_worker_wrap (struct _mail_msg *mm)
+{
+    struct sx_change_pw_msg *m;
+    m = (struct sx_change_pw_msg *) mm;
+    pwchange_worker (m);
+}
+
+static void
+pwchange_done_wrap (struct _mail_msg *mm)
 {
     struct sx_change_pw_msg *m;
+    SxChangePwDialog *pwd;
+    char *markup;
 
     m = (struct sx_change_pw_msg *) mm;
+    pwchange_done (m);
+}
 
-    g_free (m->oldpw);
-    g_free (m->newpw);
-    g_free (m->uri);
+static void
+pwchange_free_wrap (struct _mail_msg *mm)
+{
+    struct sx_change_pw_msg *m;
+
+    m = (struct sx_change_pw_msg *) mm;
+    pwchange_free (m);
 }
 
+#endif
+
+#ifdef HAVE_MAILMSG
+
+static MailMsgInfo sx_pw_change_info = {
+    sizeof (struct sx_change_pw_msg),
+    (MailMsgDescFunc) NULL,
+    (MailMsgExecFunc) pwchange_worker,
+    (MailMsgDoneFunc) pwchange_done,
+    (MailMsgFreeFunc) pwchange_free
+};
+
+#else
+
 static struct _mail_msg_op sx_pw_change_op = {
     NULL,
-    pwchange_worker,
-    pwchange_done,
-    pwchange_free,
+    pwchange_worker_wrap,
+    pwchange_done_wrap,
+    pwchange_free_wrap,
 };
 
+#endif
+
 static void
 pwd_destroy (SxChangePwDialog * pwd)
 {
@@ -300,14 +346,21 @@
         gtk_dialog_set_response_sensitive (GTK_DIALOG (pwd->dialog),
                                            GTK_RESPONSE_CANCEL, FALSE);
 
+#ifdef HAVE_MAILMSG
+        pwd->msg = mail_msg_new (&sx_pw_change_info);
+#else
         pwd->msg = mail_msg_new (&sx_pw_change_op, NULL, sizeof (*(pwd->msg)));
-
+#endif
         pwd->msg->oldpw = g_strdup (pwd->oldpw);
         pwd->msg->newpw = g_strdup (pwd->newpw);
         pwd->msg->uri = g_strdup (pwd->uri);
         pwd->msg->pwd = pwd;
 
+#ifdef HAVE_MAILMSG
+        mail_msg_unordered_push (pwd->msg);
+#else
         e_thread_put (mail_thread_new, (EMsg *) pwd->msg);
+#endif
         break;
 
     case GTK_RESPONSE_CANCEL:

Modified: branches/SCALIX/eplugin/scalix-menus.c
==============================================================================
--- branches/SCALIX/eplugin/scalix-menus.c	(original)
+++ branches/SCALIX/eplugin/scalix-menus.c	Sat Mar  8 14:44:46 2008
@@ -100,7 +100,11 @@
     about_dialog = GTK_ABOUT_DIALOG (gtk_about_dialog_new ());
     pblogo = gdk_pixbuf_new_from_xpm_data ((const char **) logo_xpm);
 
+#if GTK_CHECK_VERSION(2, 12, 0)
+    gtk_about_dialog_set_program_name (about_dialog, "Evolution-Scalix");
+#else
     gtk_about_dialog_set_name (about_dialog, "Evolution-Scalix");
+#endif
     gtk_about_dialog_set_license (about_dialog, LICENSE);
     gtk_about_dialog_set_website (about_dialog, "http://www.scalix.com";);
     gtk_about_dialog_set_version (about_dialog, VERSION);

Modified: branches/SCALIX/libescalix/scalix-container.c
==============================================================================
--- branches/SCALIX/libescalix/scalix-container.c	(original)
+++ branches/SCALIX/libescalix/scalix-container.c	Sat Mar  8 14:44:46 2008
@@ -637,7 +637,7 @@
     }
 
     /* Create the local attachment store direcotry */
-    e_util_mkdir_hier (priv->local_attachment_store, 0700);
+    g_mkdir_with_parents (priv->local_attachment_store, 0700);
 
     /* Get the camel store */
     camel_exception_init (&ex);

Modified: branches/SCALIX/libescalix/scalix-object-cache.c
==============================================================================
--- branches/SCALIX/libescalix/scalix-object-cache.c	(original)
+++ branches/SCALIX/libescalix/scalix-object-cache.c	Sat Mar  8 14:44:46 2008
@@ -493,7 +493,7 @@
 		
 		case PROP_DIR:
             		priv->cache_dir = g_value_dup_string (value);
-			result  = e_util_mkdir_hier (priv->cache_dir, 0700);
+			result  = g_mkdir_with_parents (priv->cache_dir, 0700);
 			
 			if (result != 0) {
 				g_critical ("Could not create folder hierachy\n");

Modified: branches/SCALIX/m4/intltool.m4
==============================================================================
--- branches/SCALIX/m4/intltool.m4	(original)
+++ branches/SCALIX/m4/intltool.m4	Sat Mar  8 14:44:46 2008
@@ -113,7 +113,30 @@
 
 # Substitute ALL_LINGUAS so we can use it in po/Makefile
 AC_SUBST(ALL_LINGUAS)
-    
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+  AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+                 return _nl_msg_cat_cntr],
+    [DATADIRNAME=share],
+    [case $host in
+    *-*-solaris*)
+    dnl On Solaris, if bind_textdomain_codeset is in libc,
+    dnl GNU format message catalog is always supported,
+    dnl since both are added to the libc all together.
+    dnl Hence, we'd like to go with DATADIRNAME=share
+    dnl in this case.
+    AC_CHECK_FUNC(bind_textdomain_codeset,
+      [DATADIRNAME=share], [DATADIRNAME=lib])
+    ;;
+    *)
+    [DATADIRNAME=lib]
+    ;;
+    esac])
+fi
+AC_SUBST(DATADIRNAME)
+
 IT_PO_SUBDIR([po])
 
 dnl The following is very similar to
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]