evolution-scalix r88 - in trunk: . eplugin libescalix

[psuwalski svn gnome org]

Author: psuwalski
Date: Mon Jun  9 23:46:28 2008
New Revision: 88
URL: http://svn.gnome.org/viewvc/evolution-scalix?rev=88&view=rev

Log:
configure.in: bump version to 11.4.0.0
eplugin/scalix-menus.c: refactor about dialog code. Make Close button 
work.
libesclix/scalix-object-cache.c: Add some initial values to make gcc 
from Debian Unstable happy.


Modified:
   trunk/configure.in
   trunk/eplugin/scalix-menus.c
   trunk/libescalix/scalix-object-cache.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Mon Jun  9 23:46:28 2008
@@ -10,7 +10,7 @@
 EVO_REQUIRED_VERSION=2.3.7
 EDS_REQUIRED_VERSION=1.3.7
 SERVER_REQ=10.0.0
-VERSION=11.2.1.0
+VERSION=11.4.0.0
 
 # Required for AX M4 macros to work.
 AC_CONFIG_MACRO_DIR([m4])

Modified: trunk/eplugin/scalix-menus.c
==============================================================================
--- trunk/eplugin/scalix-menus.c	(original)
+++ trunk/eplugin/scalix-menus.c	Mon Jun  9 23:46:28 2008
@@ -57,7 +57,7 @@
 #include "scalix-account-utils.h"
 #include "scalix-account-selector.h"
 
-#define LICENSE "Copyright 2005 Scalix, Inc. (www.scalix.com)\n\n\
+#define LICENSE "Copyright 2005-2008 Scalix, Inc. (www.scalix.com)\n\n\
 This program is free software; you can redistribute it and/or\n\
 modify it under the terms of version 2 of the GNU General Public\n\
 License as published by the Free Software Foundation.\n\n\
@@ -69,21 +69,11 @@
 along with this program; if not, write to the Free Software\n\
 Foundation, Inc., 59 Temple Street #330, Boston, MA 02111-1307, USA."
 
-static GtkAboutDialog *about_dialog = NULL;
-
 void com_scalix_menu_about (void *ep, gpointer * t);
 void com_scalix_rules_wizard_clicked (void *ep, EMMenuTargetSelect * target);
 
 /* ************************************************************************* */
 
-static void
-resp_cb (GtkDialog * d, int button, gpointer data)
-{
-    // FIXME: leakage
-    // gtk_widget_destroy (GKT_WIDGET (about_dialog));      
-    about_dialog = NULL;
-}
-
 void
 com_scalix_menu_about (void *ep, /* ESMenuTargetShell */ gpointer * t)
 {
@@ -92,24 +82,8 @@
     GdkPixbuf *pblogo;
     GString *cmt;
 
-    if (about_dialog != NULL) {
-        gdk_window_raise (GTK_WIDGET (about_dialog)->window);
-        return;
-    }
-
-    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);
-    gtk_about_dialog_set_logo (about_dialog, pblogo);
-
     /* Build up the server version info */
     alist = E_ACCOUNT_LIST (mail_config_get_accounts ());
     cmt = g_string_new ("Evolution Connector for Scalix Server\n");
@@ -145,11 +119,21 @@
         e_iterator_next (iter);
     }
 
-    gtk_about_dialog_set_comments (about_dialog, cmt->str);
-    g_string_free (cmt, TRUE);
+    gtk_show_about_dialog (NULL,
+#if GTK_CHECK_VERSION(2, 12, 0)
+                           "program-name",
+#else
+                           "name"
+#endif
+                           "Evolution-Scalix",
+                           "license", LICENSE,
+                           "website", "http://www.scalix.com";,
+                           "version", VERSION,
+                           "logo", pblogo,
+                           "comments", cmt->str,
+                           NULL);
 
-    g_signal_connect (about_dialog, "response", G_CALLBACK (resp_cb), NULL);
-    gtk_widget_show (GTK_WIDGET (about_dialog));
+    g_string_free (cmt, TRUE);
 }
 
 void

Modified: trunk/libescalix/scalix-object-cache.c
==============================================================================
--- trunk/libescalix/scalix-object-cache.c	(original)
+++ trunk/libescalix/scalix-object-cache.c	Mon Jun  9 23:46:28 2008
@@ -644,7 +644,7 @@
 	DBT dbt_id, dbt_data;
 	int type;
 	int iuid;
-	int flags;
+	int flags = 0;
 	char *data;
 	
 	priv = SCALIX_OBJECT_CACHE_GET_PRIVATE (cache);
@@ -964,10 +964,10 @@
 	ScalixOCIterator *ociter;
 	ScalixOCEntry    *entry;
 	int db_res;
-	int type;
-	int flags;
-	int iuid;
-	char *ostr;
+	int type = 0;
+	int flags = 0;
+	int iuid = 0;
+	char *ostr = NULL;
 	
 	g_return_val_if_fail (iterator != NULL, FALSE);