gnome-pilot r1535 - in trunk: . capplet gpilotd

[mcdavey svn gnome org]

Author: mcdavey
Date: Wed Feb 27 01:57:14 2008
New Revision: 1535
URL: http://svn.gnome.org/viewvc/gnome-pilot?rev=1535&view=rev

Log:
2008-02-27  Matt Davey <mcdavey mrao cam ac uk>
	* configure.in: Release 2.0.16.  Bumped library version numbers.  libgpilotdCM
		has got two new functions (see 2007-04-22), so increase
		CURRENT and AGE.
	* gpilotd/gnome-pilot-structures.c: refactor to avoid breaking
		binary compatibility with the addition of charset support.
	* gpilotd/gnome-pilot-structures.h: ditto
	* gpilotd/gpilotd.c: ditto
	* capplet/gnome-pilot-pdialog.c: ditto
	* capplet/util.c: ditto
	* capplet/pilot.c: ditto



Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/capplet/gnome-pilot-pdialog.c
   trunk/capplet/pilot.c
   trunk/capplet/util.c
   trunk/configure.in
   trunk/gpilotd/gnome-pilot-structures.c
   trunk/gpilotd/gnome-pilot-structures.h
   trunk/gpilotd/gpilotd.c

Modified: trunk/NEWS
==============================================================================
--- trunk/NEWS	(original)
+++ trunk/NEWS	Wed Feb 27 01:57:14 2008
@@ -1,3 +1,34 @@
+gnome-pilot 2.0.16 'Quixote', 2008-02-27
+----------------------------------------
+New Features:
+   - Support for Bluetooth sync, via the bluez support in
+     pilot-link 0.12
+   - Support for specification of the PDA charset via
+     the configuration applet (Jerry Yu and Matt Davey)
+
+
+Bug Fixes:
+   - (Ubuntu bug #81396): don't close a database if we got
+      an error when opening it.
+   - #464385: use LINGUAS file (Gilles Dartiguelongue)
+   - #410666: 64 bit compatibility in file_conduit (Devin Carraway)
+   - #431145: avoid circular dependency between libgpilotdcm and libgpilotd
+   - #400554: Add intltool support to the gnome-pilot applet. (Kjarten
+      Maraas)
+   - #399039: add HardwareSettings to categories (Denis Washington)
+   - #385434: make sysfs/usbfs check linux-specific (Jerry Yu)
+   - #385444: [solaris] workaround for lack of sync notification (Jerry Yu)
+
+And as usual, thanks to all our translators, including:
+Yannig Marchegay, Raivis Dejus, Pema Geyleg, ituohela, Joan Duran,
+pachimho, Inaki Larranaga Murgoitio, jorgegonz, Daniel Nylander, stephaner,
+Gabor Kelemen, algol, rdejus, dlodge, Djihed Afifi, Jonathan Ernst,
+Claude Paroz, Stephane Raimbault, Xavi Conder, Andrea Zagli, Tino
+Meinen, Takeshi AIHANA, Francisco Javier F. Serrador.
+
+
+
+
 gnome-pilot 2.0.15 'Alice', 2006-11-22
 --------------------------------------
 

Modified: trunk/capplet/gnome-pilot-pdialog.c
==============================================================================
--- trunk/capplet/gnome-pilot-pdialog.c	(original)
+++ trunk/capplet/gnome-pilot-pdialog.c	Wed Feb 27 01:57:14 2008
@@ -291,7 +291,7 @@
 		gtk_widget_set_sensitive (priv->pilot_charset_label, FALSE);
 		gtk_widget_set_sensitive (priv->pilot_charset_combo, FALSE);
 #else
-		gtk_entry_set_text (GTK_ENTRY (priv->pilot_charset), priv->pilot->sync_options.pilot_charset);
+		gtk_entry_set_text (GTK_ENTRY (priv->pilot_charset), priv->pilot->pilot_charset);
 #endif
 	}
 }

Modified: trunk/capplet/pilot.c
==============================================================================
--- trunk/capplet/pilot.c	(original)
+++ trunk/capplet/pilot.c	Wed Feb 27 01:57:14 2008
@@ -64,7 +64,7 @@
     pilot2->romversion = pilot->romversion;
     pilot2->sync_options.basedir = g_strdup (pilot->sync_options.basedir);
 #ifdef PILOT_LINK_0_12
-    pilot2->sync_options.pilot_charset = g_strdup (pilot->sync_options.pilot_charset);
+    pilot2->pilot_charset = g_strdup (pilot->pilot_charset);
 #endif
     dest->pilots = g_list_append (dest->pilots, pilot2);
 }
@@ -230,14 +230,14 @@
 		  }
 	  
 #ifdef PILOT_LINK_0_12
-		  pilot->sync_options.pilot_charset = gnome_config_get_string ("charset");
-		  if (pilot->sync_options.pilot_charset == NULL)
-			  pilot->sync_options.pilot_charset =
+		  pilot->pilot_charset = gnome_config_get_string ("charset");
+		  if (pilot->pilot_charset == NULL)
+			  pilot->pilot_charset =
 			      g_strdup(get_default_pilot_charset());
+#else
+		  pilot->pilot_charset = NULL;
 #endif
 
-		  /* set these to something sane since we arent using them */
-		  pilot->trusted_users = NULL;
 		  pilot->number = i;
 	  
 		  g_free (prefix);
@@ -343,7 +343,7 @@
 	  g_free (local_name);
 	  gnome_config_set_string ("basedir", pilot->sync_options.basedir);
 #ifdef PILOT_LINK_0_12
-	  gnome_config_set_string ("charset", pilot->sync_options.pilot_charset);
+	  gnome_config_set_string ("charset", pilot->pilot_charset);
 #endif
 	  gnome_config_pop_prefix ();
 	  g_free (prefix);

Modified: trunk/capplet/util.c
==============================================================================
--- trunk/capplet/util.c	(original)
+++ trunk/capplet/util.c	Wed Feb 27 01:57:14 2008
@@ -254,7 +254,7 @@
 	pilot->name = next_pilot_name (state);
 	pilot->sync_options.basedir = g_concat_dir_and_file (g_get_home_dir (), pilot->name);
 #ifdef PILOT_LINK_0_12
-	pilot->sync_options.pilot_charset =
+	pilot->pilot_charset =
 	    g_strdup(get_default_pilot_charset());
 #endif
 
@@ -614,9 +614,9 @@
 	pilot->sync_options.basedir = g_strdup (gtk_entry_get_text (GTK_ENTRY (basedir)));
 
 #ifdef PILOT_LINK_0_12
-	if (pilot->sync_options.pilot_charset)
-		g_free (pilot->sync_options.pilot_charset);
-	pilot->sync_options.pilot_charset = g_strdup (gtk_entry_get_text (GTK_ENTRY (charset)));
+	if (pilot->pilot_charset)
+		g_free (pilot->pilot_charset);
+	pilot->pilot_charset = g_strdup (gtk_entry_get_text (GTK_ENTRY (charset)));
 #endif
 }
 

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Feb 27 01:57:14 2008
@@ -12,25 +12,25 @@
 dnl ******************************
 dnl Library Versions
 dnl ******************************
-GPILOTD_CURRENT=3
-GPILOTD_REVISION=1
-GPILOTD_AGE=1
+GPILOTD_CURRENT=4
+GPILOTD_REVISION=0
+GPILOTD_AGE=2
 
 AC_SUBST(GPILOTD_CURRENT)
 AC_SUBST(GPILOTD_REVISION)
 AC_SUBST(GPILOTD_AGE)
 
 GPILOTD_CONDUIT_CURRENT=2
-GPILOTD_CONDUIT_REVISION=3
+GPILOTD_CONDUIT_REVISION=4
 GPILOTD_CONDUIT_AGE=0
 
 AC_SUBST(GPILOTD_CONDUIT_CURRENT)
 AC_SUBST(GPILOTD_CONDUIT_REVISION)
 AC_SUBST(GPILOTD_CONDUIT_AGE)
 
-GPILOTD_CM_CURRENT=2
-GPILOTD_CM_REVISION=2
-GPILOTD_CM_AGE=0
+GPILOTD_CM_CURRENT=3
+GPILOTD_CM_REVISION=0
+GPILOTD_CM_AGE=1
 
 AC_SUBST(GPILOTD_CM_CURRENT)
 AC_SUBST(GPILOTD_CM_REVISION)

Modified: trunk/gpilotd/gnome-pilot-structures.c
==============================================================================
--- trunk/gpilotd/gnome-pilot-structures.c	(original)
+++ trunk/gpilotd/gnome-pilot-structures.c	Wed Feb 27 01:57:14 2008
@@ -736,8 +736,7 @@
 	g_free (pilot->name);
 	g_free (pilot->passwd);
 	g_free (pilot->pilot_username);
-	g_list_foreach (pilot->trusted_users, (GFunc) g_free, NULL);
-	g_list_free (pilot->trusted_users);
+	g_free (pilot->pilot_charset);
 	prefix = g_strdup_printf ("/gnome-pilot.d/gpilotd/Pilot%d/", i);
 	gnome_config_push_prefix (prefix);
 
@@ -749,28 +748,30 @@
 	pilot->creation = gnome_config_get_int ("creation");
 	pilot->romversion = gnome_config_get_int ("romversion");
 	pilot->number=i;
-	pilot->trusted_users=NULL;
 	pilot->sync_options.basedir = gnome_config_get_string("basedir");
 #ifdef PILOT_LINK_0_12
-	pilot->sync_options.pilot_charset = gnome_config_get_string("charset");
+	pilot->pilot_charset = gnome_config_get_string("charset");
 	/* If no charset has been specified by user, fall back
 	 * to the PILOT_CHARSET environment variable, if that
 	 * has been specified.
 	 */
-	if (pilot->sync_options.pilot_charset == NULL) {
-		if ((pilot->sync_options.pilot_charset
+	if (pilot->pilot_charset == NULL) {
+		if ((pilot->pilot_charset
 			= getenv("PILOT_CHARSET")) != NULL) {
-			pilot->sync_options.pilot_charset =
-			    g_strdup (pilot->sync_options.pilot_charset);
+			pilot->pilot_charset =
+			    g_strdup (pilot->pilot_charset);
 		} else {
 			g_warning (_("No pilot_charset specified.  Using `%s'."),
 			    GPILOT_DEFAULT_CHARSET);
-			pilot->sync_options.pilot_charset =
+			pilot->pilot_charset =
 			    g_strdup (GPILOT_DEFAULT_CHARSET);
 		}
 	}
+#else
+	pilot->pilot_charset=NULL;
 #endif
 
+
 	gnome_config_pop_prefix ();
 	g_free(prefix);
 }
@@ -782,11 +783,7 @@
 	g_free (pilot->passwd);
 	g_free (pilot->pilot_username);
 	g_free (pilot->sync_options.basedir);
-#ifdef PILOT_LINK_0_12
-	g_free (pilot->sync_options.pilot_charset);
-#endif
-	g_list_foreach (pilot->trusted_users, (GFunc) g_free, NULL);
-	g_list_free (pilot->trusted_users);
+	g_free (pilot->pilot_charset);
 	g_free (pilot);
 }
 

Modified: trunk/gpilotd/gnome-pilot-structures.h
==============================================================================
--- trunk/gpilotd/gnome-pilot-structures.h	(original)
+++ trunk/gpilotd/gnome-pilot-structures.h	Wed Feb 27 01:57:14 2008
@@ -61,9 +61,6 @@
 struct _GPilotSyncOpt {
 	GnomePilotConduitSyncType default_sync_action; /* Unused, but exists for bin compat */
 	gchar *basedir;
-#ifdef PILOT_LINK_0_12
-	gchar *pilot_charset; /* Restore the charset of pilot */
-#endif
 };
 typedef struct _GPilotSyncOpt GPilotSyncOpt;
 
@@ -157,8 +154,9 @@
 	/* Majick numbers to id when restoring a pilot with id = 0 */
 	unsigned long creation, romversion;
 
-      /* list of gchar* unix usernames that may operate on the pilot (not implemented) */
-	GList *trusted_users;  
+	gchar *pilot_charset; /* used to be unused 'trusted users' pointer,
+				 pressed into service for charset, to
+				 preserve binary compatibility */
 	GPilotSyncOpt sync_options;
 };
 typedef struct _GPilotPilot GPilotPilot;

Modified: trunk/gpilotd/gpilotd.c
==============================================================================
--- trunk/gpilotd/gpilotd.c	(original)
+++ trunk/gpilotd/gpilotd.c	Wed Feb 27 01:57:14 2008
@@ -682,13 +682,13 @@
 #ifdef PILOT_LINK_0_12
 	iconv_t ic;
 
-	if (pilot->sync_options.pilot_charset == NULL ||
-	    pilot->sync_options.pilot_charset == '\0') {
+	if (pilot->pilot_charset == NULL ||
+	    pilot->pilot_charset == '\0') {
 		g_warning (_("No pilot_charset specified.  Using `%s'."),
 		    GPILOT_DEFAULT_CHARSET);
-		if (pilot->sync_options.pilot_charset != NULL)
-			g_free(pilot->sync_options.pilot_charset);
-		pilot->sync_options.pilot_charset =
+		if (pilot->pilot_charset != NULL)
+			g_free(pilot->pilot_charset);
+		pilot->pilot_charset =
 		    g_strdup(GPILOT_DEFAULT_CHARSET);
 	}
 
@@ -696,24 +696,24 @@
 	/* ensure configured pilot_charset is recognised
 	 * by iconv, and override with warning if not.
 	 */
-	ic = iconv_open(pilot->sync_options.pilot_charset, "UTF8");
+	ic = iconv_open(pilot->pilot_charset, "UTF8");
 	if (ic == ((iconv_t)-1)) {
 		g_warning (_("`%s' is not a recognised iconv charset, "
 			       "using `%s' instead."),
-		    pilot->sync_options.pilot_charset,
+		    pilot->pilot_charset,
 		    GPILOT_DEFAULT_CHARSET);
-		g_free (pilot->sync_options.pilot_charset);
-		pilot->sync_options.pilot_charset =
+		g_free (pilot->pilot_charset);
+		pilot->pilot_charset =
 		    g_strdup(GPILOT_DEFAULT_CHARSET);
 	} else {
 		iconv_close(ic);
 	}
 	/* Set the environment variable PILOT_CHARSET,
 	 * to support legacy conduits that don't use
-	 * sync_options.pilot_charset
+	 * pilot_charset
 	 */
 	setenv("PILOT_CHARSET",
-	    pilot->sync_options.pilot_charset, 1);
+	    pilot->pilot_charset, 1);
 #endif
 
 	ret = stat (pilot->sync_options.basedir, &buf);