Sophie

Sophie

distrib > Mandriva > 2009.0 > x86_64 > by-pkgid > 87a3db7d82c6cec9e159c559d1bd5c82 > files > 5

synce-trayicon-0.12-1mdv2009.0.src.rpm

--- trayicon/data/synce-trayicon.schemas.in	2008-07-16 15:15:55.000000000 -0700
+++ trayicon/data/synce-trayicon.schemas.in.new	2008-07-18 14:38:09.000000000 -0700
@@ -19,7 +19,7 @@
       <applyto>/apps/synce/trayicon/dccm</applyto>
       <owner>synce-trayicon</owner>
       <type>string</type>
-      <default>o</default>
+      <default>h</default>
       <locale name="C">
         <short>The dccm implementation used</short>
         <long>The dccm implementation used, 'o' for odccm (the default), 'h' for synce-hal, 'v' for vdccm.</long>
--- trayicon/src/synce-trayicon.c	2008-07-16 15:15:55.000000000 -0700
+++ trayicon/src/synce-trayicon.c.new	2008-07-19 09:15:34.000000000 -0700
@@ -793,14 +793,14 @@
   if (error)
     g_error("%s: Error contacting gconf: %s", G_STRFUNC, error->message);
   if (!tmpstr)
-    priv->which_dccm = USE_ODCCM;
+    priv->which_dccm = USE_HAL;
   else {
     if (!(g_ascii_strcasecmp(tmpstr, "v")))
       priv->which_dccm = USE_VDCCM;
-    else if (!(g_ascii_strcasecmp(tmpstr, "h")))
-      priv->which_dccm = USE_HAL;
-    else
+    else if (!(g_ascii_strcasecmp(tmpstr, "o")))
       priv->which_dccm = USE_ODCCM;
+    else
+      priv->which_dccm = USE_HAL;
     g_free(tmpstr);
   }