[gnome-pilot/gtk3: 5/6] Merge changes on master to gtk3 branch.

[Matthew Charles Davey <mcdavey src gnome org>]

commit 30a93b09ddcffce3b97521b0d7b8fae25cd67d16
Merge: 25cb428 92d6841
Author: Matt Davey <mcdavey mrao cam ac uk>
Date:   Sun Mar 13 18:46:08 2011 +0000

    Merge changes on master to gtk3 branch.
    
    Conflicts:
    	ChangeLog
    	capplet/gnome-pilot-pdialog.c
    	capplet/pilot.c

 ChangeLog                      |   10 +-
 capplet/gnome-pilot-pdialog.c  |    9 +-
 capplet/pilot.c                |   16 +-
 gpilotd/gnome-pilot-client.gob |    2 +
 gpilotd/gpilot-daemon.c        |   16 ++-
 po/zh_CN.po                    |  538 +++++++++++++++++++++++-----------------
 6 files changed, 348 insertions(+), 243 deletions(-)
---
diff --cc ChangeLog
index 7a6b9fc,a14600b..48261f3
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,36 -1,11 +1,44 @@@
 -2011-02-15  Matt Davey <mcdavey mrao cam ac uk>
 +2011-03-13  Matt Davey <mcdavey mrao cam ac uk>
++       * gtk3 branch: merge changes from master
+        * capplet/pilot.c: Avoid sending non-UTF8 pilot-encoded username
+ 	over DBUS.  Store username as UTF8 and convert at the last moment
+ 	when sending/receiving from pda. #641289
+        * capplet/gnome-pilot-pdialog.c: ditto
+        * gpilotd/gnome-pilot-client.gob: ditto
+        * gpilotd/gpilot-daemon.c: ditto
+ 
++2011-03-13  Matt Davey <mcdavey mrao cam ac uk>
 +       * gtk3 branch
 +       * Migrate applet from bonobo to dbus: #592604, #630725
 +       * NOTE: barely tested until I can get a version of gnome3/libusb to sync
 +       * Makefile.am: return applet directory to the build, now it's migrated to gtk3
 +       * applet/GNOME_PilotApplet.server.in.in: remove
 +       * applet/Makefile.am: migrate from bonobo to libpanelapplet-4
 +       * applet/pilot.c: ditto
 +       * configure.ac: ditto
 +       * po/POTFILES.in: ditto
 +       * applet/org.gnome.applets.PilotApplet.panel-applet.in.in: added
 +       * applet/org.gnome.panel.applet.PilotAppletFactory.service.in: added
 +
 +
 +2011-01-29  Matt Davey <mcdavey mrao cam ac uk>
 +       * gtk3 branch.
 +       * configure.ac and various Makefile.am: bump libraries to v3.
 +	  Update all dependencies to gtk3 versions.
 +	  Require pilot-link 0.12, remove hal option, require gudev,
 +	  rename libraries to append "-3.0", and reset libversions to 0.0.0.
 +       * gnome-pilot-3.0.pc.in: renamed from gnome-pilot-2.0.pc.in
 +       * Makefile.am: reference gnome-pilot-3.0.pc
 +       * various: remove PILOT_LINK_0_12 #defines.  Ancient history
 +       * various: remove references to GtkObject and friends.
 +       * libgpilotdCM: get rid of this directory, put stuff in gpilotd/
 +       * include files: reorganise installed includes into
 +	"gnome-pilot-3.0" rather than include/gpilotd/.  Remove all
 +	relative directory includes (<gpilotd/...h>).  Add appropriate
 +	include flags to gnome-pilot-3.0.pc.in, instead.
 +       * Note: at present, the applet is broken, as it needs to be
 +	 ported to libpanelapplet-3.
 +
- 
  2011-01-03  Matt Davey <mcdavey mrao cam ac uk>
         * applet/Makefile.am: fix gob rules to support
  		parallel builds.  Thanks Matt McCutchen.  #634874
diff --cc capplet/gnome-pilot-pdialog.c
index b39c3c7,4f5f118..977a51a
--- a/capplet/gnome-pilot-pdialog.c
+++ b/capplet/gnome-pilot-pdialog.c
@@@ -492,12 -506,11 +490,11 @@@ gppd_pilot_send (GtkWidget *widget, gpo
  	if (dev != NULL){
  		pilot = g_new0 (GPilotPilot, 1);
  		
 -		read_pilot_config (GTK_OBJECT (gppd), pilot);
 +		read_pilot_config (G_OBJECT (gppd), pilot);
  
  		user.userID = pilot->pilot_id;
- 		if (! pilot->pilot_username || (convert_ToPilotChar_WithCharset ("UTF-8", pilot->pilot_username, strlen(pilot->pilot_username), &user.username, NULL) == -1)) {
- 			user.username = g_strdup (pilot->pilot_username);
- 		}
+ 		user.username = g_strdup (pilot->pilot_username);
+ 
  		if (gnome_pilot_client_set_user_info (priv->gpc, 
  						      dev->name, 
  						      user, 
diff --cc capplet/pilot.c
index fd0cec4,5c39f9a..fb866dc
--- a/capplet/pilot.c
+++ b/capplet/pilot.c
@@@ -385,13 -385,12 +380,10 @@@ savePilotState (PilotState *state
  	  g_key_file_set_integer (kfile, iPilot, "pilotid", pilot->pilot_id);
  	  g_key_file_set_integer (kfile, iPilot, "creation", pilot->creation);
  	  g_key_file_set_integer (kfile, iPilot, "romversion", pilot->romversion);
- 	  if (!pilot->pilot_username|| (convert_ToPilotChar_WithCharset ("UTF-8", pilot->pilot_username, strlen (pilot->pilot_username), &local_name, NULL) == -1)) {
- 		  local_name = g_strdup (pilot->pilot_username);
- 	  }
- 	  g_key_file_set_string (kfile, iPilot, "pilotusername", local_name);
- 	  g_free (local_name);
+ 	  /* store username as utf8 */
+ 	  g_key_file_set_string (kfile, iPilot, "pilotusername", pilot->pilot_username);
  	  g_key_file_set_string (kfile, iPilot, "basedir", pilot->sync_options.basedir);
 -#ifdef PILOT_LINK_0_12
  	  g_key_file_set_string (kfile, iPilot, "charset", pilot->pilot_charset);
 -#endif
  	  g_free (iPilot);
  	  tmp = tmp->next;
  	  i++;