Attachment #92804 for bug #130539

View | Details | Raw Unified | Return to bug 130539
Collapse All | Expand All




# $FreeBSD: ports/palm/synce-trayicon/Makefile,v 1.20 2008/08/19 23:00:29 miwi Exp $

PORTNAME=	synce-trayicon
PORTVERSION=	0.13
CATEGORIES=	palm
MASTER_SITES=	SF
MASTER_SITE_SUBDIR=	synce

LIB_DEPENDS=	rra.0:${PORTSDIR}/palm/synce-librra \
		gtop-2.0.7:${PORTSDIR}/devel/libgtop \
		unshield.0:${PORTSDIR}/archivers/unshield \
		orange.0:${PORTSDIR}/archivers/liborange \
		notify.1:${PORTSDIR}/devel/libnotify
RUN_DEPENDS=	${LOCALBASE}/libexec/gvfsd-synce:${PORTSDIR}/palm/synce-gvfs \
		${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon

GNU_CONFIGURE=	yes
USE_GMAKE=	yes
USE_GETTEXT=	yes
USE_GNOME=	gnomeprefix gnomehack libgnomeui
INSTALLS_ICONS=	yes
GCONF_SCHEMAS=	${PORTNAME}.schemas
LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
CFLAGS+=	-I${LOCALBASE}/include ${PTHREAD_LIBS}
CONFIGURE_ENV=	CFLAGS="${CFLAGS}" \
		LDFLAGS="${LDFLAGS}"
SUB_FILES=	pkg-message

MAN1=		${PORTNAME}.1

.include <bsd.port.pre.mk>

.if defined(WITH_NOTIFY)
LIB_DEPENDS+=	notify.1:${PORTSDIR}/devel/libnotify
RUN_DEPENDS+=	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
.endif

post-patch:
.if !defined(WITH_NOTIFY)
	@${REINPLACE_CMD} -e 's|enable_notify=yes|enable_notify=no|' ${WRKSRC}/configure
.endif

pre-configure:
	@if [ -z "`${GREP} libsynce ${LOCALBASE}/libdata/pkgconfig/liborange.pc`" ]; then \
	    ${ECHO_MSG} ; \

Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (synce-trayicon-0.12.tar.gz) = 46da7e0de59645a4272a106f718a0f0a	1	MD5 (synce-trayicon-0.13.tar.gz) = 279d117111426aac21a25843dc48e2a6
2	SHA256 (synce-trayicon-0.12.tar.gz) = 5bfea3a88bba1656b6e72dea1ef20277be8a1e8fdf1c3805cf9c40037bd6e7d6	2	SHA256 (synce-trayicon-0.13.tar.gz) = 11f8f7da9ec2493a40b14a621b1c4871f55f66addcc08a19f753a360cdcff369
3	SIZE (synce-trayicon-0.12.tar.gz) = 459329	3	SIZE (synce-trayicon-0.13.tar.gz) = 382406

Lines 1-6 Link Here

(-)pkg-plist (+5 lines)
1	bin/synce-trayicon	1	bin/synce-trayicon
2	lib/synce-trayicon/modules/test-mod.so	2	lib/synce-trayicon/modules/test-mod.so
3	lib/synce-trayicon/modules/test-mod.la	3	lib/synce-trayicon/modules/test-mod.la
		4	share/applications/synce-trayicon.desktop
		5	share/gnome/autostart/synce-trayicon-autostart.desktop
4	share/locale/ru/LC_MESSAGES/synce-trayicon.mo	6	share/locale/ru/LC_MESSAGES/synce-trayicon.mo
5	share/locale/sv/LC_MESSAGES/synce-trayicon.mo	7	share/locale/sv/LC_MESSAGES/synce-trayicon.mo
6	share/icons/hicolor/22x22/apps/synce-gray.png	8	share/icons/hicolor/22x22/apps/synce-gray.png
Lines 8-13 Link Here
8	share/icons/hicolor/48x48/apps/synce-gray.png	10	share/icons/hicolor/48x48/apps/synce-gray.png
9	share/icons/hicolor/48x48/apps/synce-color.png	11	share/icons/hicolor/48x48/apps/synce-color.png
10	share/synce/synce_trayicon_properties.glade	12	share/synce/synce_trayicon_properties.glade
		13	@exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
		14	@unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null \|\| /usr/bin/true
11	@dirrmtry lib/synce-trayicon/modules	15	@dirrmtry lib/synce-trayicon/modules
12	@dirrmtry lib/synce-trayicon	16	@dirrmtry lib/synce-trayicon
		17	@dirrmtry share/applications
13	@dirrmtry share/synce	18	@dirrmtry share/synce




--- data/synce-trayicon.schemas.in.orig	2008-07-28 10:01:15.000000000 +1000
+++ data/synce-trayicon.schemas.in	2008-07-28 10:01:39.000000000 +1000
@@ -19,10 +19,10 @@
       <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>
+        <long>The dccm implementation used, 'h' for synce-hal (the default), 'v' for vdccm.</long>
       </locale>
     </schema>
 




--- data/synce_trayicon_properties.glade.orig	2008-04-16 05:17:48.000000000 +1000
+++ data/synce_trayicon_properties.glade	2008-07-26 22:06:15.000000000 +1000
@@ -53,20 +53,6 @@
                         <property name="visible">True</property>
                         <property name="spacing">6</property>
                         <child>
-                          <widget class="GtkRadioButton" id="prefs_use_odccm">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="label" translatable="yes">Odccm</property>
-                            <property name="use_underline">True</property>
-                            <property name="response_id">0</property>
-                            <property name="draw_indicator">True</property>
-                          </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                          </packing>
-                        </child>
-                        <child>
                           <widget class="GtkRadioButton" id="prefs_use_hal">
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
@@ -74,12 +60,10 @@
                             <property name="use_underline">True</property>
                             <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">prefs_use_odccm</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>
@@ -90,12 +74,12 @@
                             <property name="use_underline">True</property>
                             <property name="response_id">0</property>
                             <property name="draw_indicator">True</property>
-                            <property name="group">prefs_use_odccm</property>
+                            <property name="group">prefs_use_hal</property>
                           </widget>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="position">2</property>
+                            <property name="position">1</property>
                           </packing>
                         </child>
                         <child>

Removed Link Here

(-)files/patch-src_hal-client.c (-11 lines)
1	--- src/hal-client.c.orig 2008-07-28 09:58:40.000000000 +1000
2	+++ src/hal-client.c 2008-07-28 09:59:09.000000000 +1000
3	@@ -188,7 +188,7 @@
4	goto exit;
5	}
6
7	- if ( (strcmp(pw_status, "unset") == 0) \|\| (strcmp(pw_status, "unlocked")) ) {
8	+ if ( (strcmp(pw_status, "unset") == 0) \|\| (strcmp(pw_status, "unlocked") == 0) ) {
9	g_ptr_array_remove_index(priv->pending_devices, i);
10
11	if (!libhal_device_remove_property_watch(priv->hal_ctx, udi, &dbus_error))




--- src/properties.c.orig	2008-07-26 22:26:43.000000000 +1000
+++ src/properties.c	2008-07-26 22:28:54.000000000 +1000
@@ -23,7 +23,6 @@
 
   if (!(g_ascii_strcasecmp(key, "/apps/synce/trayicon/dccm"))) {
     const gchar *which_dccm = gconf_value_get_string(value);
-    GtkWidget *prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm");	
     GtkWidget *prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm");	
     GtkWidget *prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal");	
     GtkWidget *prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm");	
@@ -31,33 +30,18 @@
     if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE);
       gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE);
-    } else if (!(g_ascii_strcasecmp(which_dccm, "o"))) {
-      gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE);
-      gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
     } else if (!(g_ascii_strcasecmp(which_dccm, "h"))) {
       gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
       gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
     } else {
       gconf_client_set_string (conf_client,
-			    "/apps/synce/trayicon/dccm", "o", NULL);
+			    "/apps/synce/trayicon/dccm", "h", NULL);
     }
   }
 }
 
 
 static void
-prefs_use_odccm_toggled_cb (GtkWidget *widget, gpointer data)
-{
-    gboolean state;
-    GConfClient *conf_client = gconf_client_get_default();
-
-    state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
-    if (state)
-      gconf_client_set_string (conf_client,
-			       "/apps/synce/trayicon/dccm", "o", NULL);
-}
-
-static void
 prefs_use_vdccm_toggled_cb (GtkWidget *widget, gpointer data)
 {
     gboolean state;
@@ -107,7 +91,7 @@
 GtkWidget *
 run_prefs_dialog (SynceTrayIcon *trayicon)
 {
-  GtkWidget *prefs_window, *prefs_use_odccm, *prefs_use_vdccm, *prefs_use_hal, *prefs_start_stop_vdccm, *close_button;
+  GtkWidget *prefs_window, *prefs_use_vdccm, *prefs_use_hal, *prefs_start_stop_vdccm, *close_button;
   gchar *which_dccm;
   GError *error = NULL;
 
@@ -117,36 +101,30 @@
 
   prefs_window = glade_xml_get_widget (xml, "prefs_window");
 
-  prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm");
   prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm");
   prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal");
   prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm");
 
   if (!(which_dccm = gconf_client_get_string (conf_client,
 					      "/apps/synce/trayicon/dccm", &error))) {
-    which_dccm = g_strdup("o");
+    which_dccm = g_strdup("h");
     if (error) {
       g_warning("%s: Get dccm type from gconf failed: %s", G_STRFUNC, error->message);
       g_error_free(error);
     }
   }
 
-  if (!(g_ascii_strcasecmp(which_dccm, "h"))) {
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
-    gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
-  } else if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
+  if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE);
     gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE);
     gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_start_stop_vdccm), 
 				  gconf_client_get_bool (conf_client,
 							 "/apps/synce/trayicon/start_vdccm", NULL));
   } else {
-    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE);
+    gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
     gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
   }
 
-  g_signal_connect (G_OBJECT (prefs_use_odccm), "toggled",
-		      G_CALLBACK (prefs_use_odccm_toggled_cb), NULL);
   g_signal_connect (G_OBJECT (prefs_use_vdccm), "toggled",
 		      G_CALLBACK (prefs_use_vdccm_toggled_cb), prefs_start_stop_vdccm);
   g_signal_connect (G_OBJECT (prefs_use_hal), "toggled",




--- src/synce-trayicon.c	2008/07/12 13:00:38	3510
+++ src/synce-trayicon.c	2008/08/12 20:40:23	3551
@@ -229,7 +229,21 @@
 static void
 password_required_on_device_cb(DccmClient *comms_client, gchar *pdaname, gpointer user_data)
 {
+#ifdef ENABLE_NOTIFY
+
+  SynceTrayIcon *self = SYNCE_TRAYICON(user_data);
+  gchar *notify_string = NULL;
+
+  notify_string = g_strdup_printf("The device %s is locked. Please unlock it by following instructions on the device", pdaname);
+  event_notification(self, "Device locked", notify_string);
+  g_free(notify_string);
+
+#else  /* ENABLE_NOTIFY */
+
   device_do_password_on_device_dialog(pdaname);
+
+#endif /* ENABLE_NOTIFY */
+
 }
 
 static void
@@ -471,17 +485,6 @@
 }
 
 static void
-menu_software (GtkWidget *button, SynceTrayIcon *self)
-{
-  char *argv[1] = {
-    SYNCE_SOFTWARE_MANAGER
-  };
-  if (gnome_execute_async(NULL,1, argv) == -1) {
-    synce_error_dialog(_("Can't open the software manager\nmake sure you have synce-software-manager installed"));
-  }
-}
-
-static void
 menu_preferences (GtkWidget *button, SynceTrayIcon *self)
 {
   run_prefs_dialog(self);

Return to bug 130539

Lines 5-11 Link Here

(-)Makefile (-20 / +10 lines)
5	# $FreeBSD: ports/palm/synce-trayicon/Makefile,v 1.20 2008/08/19 23:00:29 miwi Exp $	5	# $FreeBSD: ports/palm/synce-trayicon/Makefile,v 1.20 2008/08/19 23:00:29 miwi Exp $
6		6
7	PORTNAME= synce-trayicon	7	PORTNAME= synce-trayicon
8	PORTVERSION= 0.12	8	PORTVERSION= 0.13
9	CATEGORIES= palm	9	CATEGORIES= palm
10	MASTER_SITES= SF	10	MASTER_SITES= SF
11	MASTER_SITE_SUBDIR= synce	11	MASTER_SITE_SUBDIR= synce
Lines 16-52 Link Here
16	LIB_DEPENDS= rra.0:${PORTSDIR}/palm/synce-librra \	16	LIB_DEPENDS= rra.0:${PORTSDIR}/palm/synce-librra \
17	gtop-2.0.7:${PORTSDIR}/devel/libgtop \	17	gtop-2.0.7:${PORTSDIR}/devel/libgtop \
18	unshield.0:${PORTSDIR}/archivers/unshield \	18	unshield.0:${PORTSDIR}/archivers/unshield \
19	orange.0:${PORTSDIR}/archivers/liborange	19	orange.0:${PORTSDIR}/archivers/liborange \
20	RUN_DEPENDS= ${LOCALBASE}/libexec/gvfsd-synce:${PORTSDIR}/palm/synce-gvfs	20	notify.1:${PORTSDIR}/devel/libnotify
21		21	RUN_DEPENDS= ${LOCALBASE}/libexec/gvfsd-synce:${PORTSDIR}/palm/synce-gvfs \
22	OPTIONS= NOTIFY "Enable libnotify support" on	22	${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
23		23
24	GNU_CONFIGURE= yes	24	GNU_CONFIGURE= yes
25	USE_GMAKE= yes	25	USE_GMAKE= yes
26	USE_GETTEXT= yes	26	USE_GETTEXT= yes
27	USE_GNOME= gnomeprefix gnomehack gnometarget libgnomeui	27	USE_GNOME= gnomeprefix gnomehack libgnomeui
28	INSTALLS_ICONS= yes	28	INSTALLS_ICONS= yes
29	GCONF_SCHEMAS= ${PORTNAME}.schemas	29	GCONF_SCHEMAS= ${PORTNAME}.schemas
30	LDFLAGS+= -L${LOCALBASE}/lib	30	LDFLAGS+= -L${LOCALBASE}/lib ${PTHREAD_CFLAGS}
31	CFLAGS+= -I${LOCALBASE}/include	31	CFLAGS+= -I${LOCALBASE}/include ${PTHREAD_LIBS}
32	CONFIGURE_ENV= CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \	32	CONFIGURE_ENV= CFLAGS="${CFLAGS}" \
33	LDFLAGS="${LDFLAGS} ${PTHREAD_LIBS}"	33	LDFLAGS="${LDFLAGS}"
34	SUB_FILES= pkg-message	34	SUB_FILES= pkg-message
35		35
36	MAN1= ${PORTNAME}.1	36	MAN1= ${PORTNAME}.1
37		37
38	.include <bsd.port.pre.mk>	38	.include <bsd.port.pre.mk>
39		39
40	.if defined(WITH_NOTIFY)
41	LIB_DEPENDS+= notify.1:${PORTSDIR}/devel/libnotify
42	RUN_DEPENDS+= ${LOCALBASE}/libexec/notification-daemon:${PORTSDIR}/deskutils/notification-daemon
43	.endif
44
45	post-patch:
46	.if !defined(WITH_NOTIFY)
47	@${REINPLACE_CMD} -e 's\|enable_notify=yes\|enable_notify=no\|' ${WRKSRC}/configure
48	.endif
49
50	pre-configure:	40	pre-configure:
51	@if [ -z "`${GREP} libsynce ${LOCALBASE}/libdata/pkgconfig/liborange.pc`" ]; then \	41	@if [ -z "`${GREP} libsynce ${LOCALBASE}/libdata/pkgconfig/liborange.pc`" ]; then \
52	${ECHO_MSG} ; \	42	${ECHO_MSG} ; \

Removed Link Here

(-)files/patch-data_synce-trayicon.schemas.in (-15 lines)
1	--- data/synce-trayicon.schemas.in.orig 2008-07-28 10:01:15.000000000 +1000
2	+++ data/synce-trayicon.schemas.in 2008-07-28 10:01:39.000000000 +1000
3	@@ -19,10 +19,10 @@
4	<applyto>/apps/synce/trayicon/dccm</applyto>
5	<owner>synce-trayicon</owner>
6	<type>string</type>
7	- <default>o</default>
8	+ <default>h</default>
9	<locale name="C">
10	<short>The dccm implementation used</short>
11	- <long>The dccm implementation used, 'o' for odccm (the default), 'h' for synce-hal, 'v' for vdccm.</long>
12	+ <long>The dccm implementation used, 'h' for synce-hal (the default), 'v' for vdccm.</long>
13	</locale>
14	</schema>
15

Removed Link Here

(-)files/patch-data_synce_trayicon_properties.glade (-51 lines)
1	--- data/synce_trayicon_properties.glade.orig 2008-04-16 05:17:48.000000000 +1000
2	+++ data/synce_trayicon_properties.glade 2008-07-26 22:06:15.000000000 +1000
3	@@ -53,20 +53,6 @@
4	<property name="visible">True</property>
5	<property name="spacing">6</property>
6	<child>
7	- <widget class="GtkRadioButton" id="prefs_use_odccm">
8	- <property name="visible">True</property>
9	- <property name="can_focus">True</property>
10	- <property name="label" translatable="yes">Odccm</property>
11	- <property name="use_underline">True</property>
12	- <property name="response_id">0</property>
13	- <property name="draw_indicator">True</property>
14	- </widget>
15	- <packing>
16	- <property name="expand">False</property>
17	- <property name="fill">False</property>
18	- </packing>
19	- </child>
20	- <child>
21	<widget class="GtkRadioButton" id="prefs_use_hal">
22	<property name="visible">True</property>
23	<property name="can_focus">True</property>
24	@@ -74,12 +60,10 @@
25	<property name="use_underline">True</property>
26	<property name="response_id">0</property>
27	<property name="draw_indicator">True</property>
28	- <property name="group">prefs_use_odccm</property>
29	</widget>
30	<packing>
31	<property name="expand">False</property>
32	<property name="fill">False</property>
33	- <property name="position">1</property>
34	</packing>
35	</child>
36	<child>
37	@@ -90,12 +74,12 @@
38	<property name="use_underline">True</property>
39	<property name="response_id">0</property>
40	<property name="draw_indicator">True</property>
41	- <property name="group">prefs_use_odccm</property>
42	+ <property name="group">prefs_use_hal</property>
43	</widget>
44	<packing>
45	<property name="expand">False</property>
46	<property name="fill">False</property>
47	- <property name="position">2</property>
48	+ <property name="position">1</property>
49	</packing>
50	</child>
51	<child>

Removed Link Here

(-)files/patch-src_properties.c (-94 lines)
1	--- src/properties.c.orig 2008-07-26 22:26:43.000000000 +1000
2	+++ src/properties.c 2008-07-26 22:28:54.000000000 +1000
3	@@ -23,7 +23,6 @@
4
5	if (!(g_ascii_strcasecmp(key, "/apps/synce/trayicon/dccm"))) {
6	const gchar *which_dccm = gconf_value_get_string(value);
7	- GtkWidget *prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm");
8	GtkWidget *prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm");
9	GtkWidget *prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal");
10	GtkWidget *prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm");
11	@@ -31,33 +30,18 @@
12	if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
13	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE);
14	gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE);
15	- } else if (!(g_ascii_strcasecmp(which_dccm, "o"))) {
16	- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE);
17	- gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
18	} else if (!(g_ascii_strcasecmp(which_dccm, "h"))) {
19	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
20	gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
21	} else {
22	gconf_client_set_string (conf_client,
23	- "/apps/synce/trayicon/dccm", "o", NULL);
24	+ "/apps/synce/trayicon/dccm", "h", NULL);
25	}
26	}
27	}
28
29
30	static void
31	-prefs_use_odccm_toggled_cb (GtkWidget *widget, gpointer data)
32	-{
33	- gboolean state;
34	- GConfClient *conf_client = gconf_client_get_default();
35	-
36	- state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget));
37	- if (state)
38	- gconf_client_set_string (conf_client,
39	- "/apps/synce/trayicon/dccm", "o", NULL);
40	-}
41	-
42	-static void
43	prefs_use_vdccm_toggled_cb (GtkWidget *widget, gpointer data)
44	{
45	gboolean state;
46	@@ -107,7 +91,7 @@
47	GtkWidget *
48	run_prefs_dialog (SynceTrayIcon *trayicon)
49	{
50	- GtkWidget prefs_window, prefs_use_odccm, prefs_use_vdccm, prefs_use_hal, prefs_start_stop_vdccm, close_button;
51	+ GtkWidget prefs_window, prefs_use_vdccm, prefs_use_hal, prefs_start_stop_vdccm, *close_button;
52	gchar *which_dccm;
53	GError *error = NULL;
54
55	@@ -117,36 +101,30 @@
56
57	prefs_window = glade_xml_get_widget (xml, "prefs_window");
58
59	- prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm");
60	prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm");
61	prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal");
62	prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm");
63
64	if (!(which_dccm = gconf_client_get_string (conf_client,
65	"/apps/synce/trayicon/dccm", &error))) {
66	- which_dccm = g_strdup("o");
67	+ which_dccm = g_strdup("h");
68	if (error) {
69	g_warning("%s: Get dccm type from gconf failed: %s", G_STRFUNC, error->message);
70	g_error_free(error);
71	}
72	}
73
74	- if (!(g_ascii_strcasecmp(which_dccm, "h"))) {
75	- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
76	- gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
77	- } else if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
78	+ if (!(g_ascii_strcasecmp(which_dccm, "v"))) {
79	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE);
80	gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE);
81	gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_start_stop_vdccm),
82	gconf_client_get_bool (conf_client,
83	"/apps/synce/trayicon/start_vdccm", NULL));
84	} else {
85	- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE);
86	+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE);
87	gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE);
88	}
89
90	- g_signal_connect (G_OBJECT (prefs_use_odccm), "toggled",
91	- G_CALLBACK (prefs_use_odccm_toggled_cb), NULL);
92	g_signal_connect (G_OBJECT (prefs_use_vdccm), "toggled",
93	G_CALLBACK (prefs_use_vdccm_toggled_cb), prefs_start_stop_vdccm);
94	g_signal_connect (G_OBJECT (prefs_use_hal), "toggled",

Removed Link Here

(-)files/patch-src_synce-trayicon.c (-42 lines)
1	--- src/synce-trayicon.c 2008/07/12 13:00:38 3510
2	+++ src/synce-trayicon.c 2008/08/12 20:40:23 3551
3	@@ -229,7 +229,21 @@
4	static void
5	password_required_on_device_cb(DccmClient comms_client, gchar pdaname, gpointer user_data)
6	{
7	+#ifdef ENABLE_NOTIFY
8	+
9	+ SynceTrayIcon *self = SYNCE_TRAYICON(user_data);
10	+ gchar *notify_string = NULL;
11	+
12	+ notify_string = g_strdup_printf("The device %s is locked. Please unlock it by following instructions on the device", pdaname);
13	+ event_notification(self, "Device locked", notify_string);
14	+ g_free(notify_string);
15	+
16	+#else /* ENABLE_NOTIFY */
17	+
18	device_do_password_on_device_dialog(pdaname);
19	+
20	+#endif /* ENABLE_NOTIFY */
21	+
22	}
23
24	static void
25	@@ -471,17 +485,6 @@
26	}
27
28	static void
29	-menu_software (GtkWidget button, SynceTrayIcon self)
30	-{
31	- char *argv[1] = {
32	- SYNCE_SOFTWARE_MANAGER
33	- };
34	- if (gnome_execute_async(NULL,1, argv) == -1) {
35	- synce_error_dialog(_("Can't open the software manager\nmake sure you have synce-software-manager installed"));
36	- }
37	-}
38	-
39	-static void
40	menu_preferences (GtkWidget button, SynceTrayIcon self)
41	{
42	run_prefs_dialog(self);