Attachment 147953 Details for Bug 202764 – Needed patch for new synce-trayicon

[patch] Needed patch for new synce-trayicon

synce-trayicon-vdccm.patch (text/plain), 6.58 KB, created by Eric Work on 2007-02-13 01:37:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Work

Created: 2007-02-13 01:37:28 UTC

Size: 6.58 KB

patch

obsolete

>diff -urN synce-trayicon-0.9.0.orig/data/synce_trayicon_properties.glade synce-trayicon-0.9.0/data/synce_trayicon_properties.glade
>--- synce-trayicon-0.9.0.orig/data/synce_trayicon_properties.glade	2007-02-12 17:02:39.000000000 -0800
>+++ synce-trayicon-0.9.0/data/synce_trayicon_properties.glade	2007-02-12 17:04:46.000000000 -0800
>@@ -224,7 +224,7 @@
> 			  <child>
> 			    <widget class="GtkLabel" id="label5">
> 			      <property name="visible">True</property>
>-			      <property name="label" translatable="yes">The password will be used the next time &quot;dccm&quot;  is started (next time you login).
>+			      <property name="label" translatable="yes">The password will be used the next time &quot;vdccm&quot;  is started (next time you login).
>  
> The password will be stored as plain text. This means that it might be read by other people. It is default stored so that only administrators have access, but that might not be true for all system setups.</property>
> 			      <property name="use_underline">False</property>
>diff -urN synce-trayicon-0.9.0.orig/po/ru.po synce-trayicon-0.9.0/po/ru.po
>--- synce-trayicon-0.9.0.orig/po/ru.po	2007-02-12 17:02:39.000000000 -0800
>+++ synce-trayicon-0.9.0/po/ru.po	2007-02-12 17:03:43.000000000 -0800
>@@ -109,10 +109,10 @@
> 
> #: src/synce-trayicon.c:532
> msgid ""
>-"Can't start dccm which is needed to comunicate \n"
>+"Can't start vdccm which is needed to comunicate \n"
> "with the PDA. Make sure it is installed and try again."
> msgstr ""
>-"îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ dccm (ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ Ó×ÑÚÉ Ó PDA).\n"
>+"îÅ×ÏÚÍÏÖÎÏ ÚÁÐÕÓÔÉÔØ vdccm (ÎÅÏÂÈÏÄÉÍÏ ÄÌÑ Ó×ÑÚÉ Ó PDA).\n"
> "õÂÅÄÉÔÅÓØ, ÞÔÏ ÐÒÏÇÒÁÍÍÁ ÕÓÔÁÎÏ×ÌÅÎÁ, É ÐÏÐÒÏÂÕÊÔÅ ÓÎÏ×Á."
> 
> #: src/synce-trayicon.c:559
>@@ -145,14 +145,14 @@
> 
> #: data/synce_trayicon_properties.glade.h:7
> msgid ""
>-"The password will be used the next time \"dccm\"  is started (next time you "
>+"The password will be used the next time \"vdccm\"  is started (next time you "
> "login).\n"
> " \n"
> "The password will be stored as plain text. This means that it might be read "
> "by other people. It is default stored so that only administrators have "
> "access, but that might not be true for all system setups."
> msgstr ""
>-"ðÁÒÏÌØ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ ÐÒÉ ÓÌÅÄÕÀÝÅÍ ×ÈÏÄÅ × ÓÉÓÔÅÍÕ (ÚÁÐÕÓËÅ dccm).\n"
>+"ðÁÒÏÌØ ÂÕÄÅÔ ÉÓÐÏÌØÚÏ×ÁÎ ÐÒÉ ÓÌÅÄÕÀÝÅÍ ×ÈÏÄÅ × ÓÉÓÔÅÍÕ (ÚÁÐÕÓËÅ vdccm).\n"
> " \n"
> "ïÎ ÈÒÁÎÉÔÓÑ ÏÔËÒÙÔÙÍ ÔÅËÓÔÏÍ É ÍÏÖÅÔ ÂÙÔØ ÐÒÏÞÉÔÁÎ ÄÒÕÇÉÍÉ ÌÀÄØÍÉ."
> "ðÏ ÕÍÏÌÞÁÎÉÀ ÄÏÓÔÕÐ ÒÁÚÒÅÛÅÎ ÔÏÌØËÏ ÁÄÍÉÎÉÓÔÒÁÔÏÒÁÍ, ÎÏ ÜÔÏ ÍÏÖÅÔ ÂÙÔØ"
>diff -urN synce-trayicon-0.9.0.orig/po/sv.po synce-trayicon-0.9.0/po/sv.po
>--- synce-trayicon-0.9.0.orig/po/sv.po	2007-02-12 17:02:39.000000000 -0800
>+++ synce-trayicon-0.9.0/po/sv.po	2007-02-12 17:04:06.000000000 -0800
>@@ -108,10 +108,10 @@
> 
> #: src/synce-trayicon.c:528
> msgid ""
>-"Can't start dccm which is needed to comunicate \n"
>+"Can't start vdccm which is needed to comunicate \n"
> "with the PDA. Make sure it is installed and try again."
> msgstr ""
>-"Kan inte starta dccm krÃ¤vs fÃ¶r att kommunicera \n"
>+"Kan inte starta vdccm krÃ¤vs fÃ¶r att kommunicera \n"
> "med handdatorn. Kontrollera att den Ã¤r installerad och fÃ¶rsÃ¶k igen."
> 
> #: src/synce-trayicon.c:557
>@@ -145,14 +145,14 @@
> 
> #: data/synce_trayicon_properties.glade.h:7
> msgid ""
>-"The password will be used the next time \"dccm\"  is started (next time you "
>+"The password will be used the next time \"vdccm\"  is started (next time you "
> "login).\n"
> " \n"
> "The password will be stored as plain text. This means that it might be read "
> "by other people. It is default stored so that only administrators have "
> "access, but that might not be true for all system setups."
> msgstr ""
>-"LÃ¶senordet kommer att anvÃ¤ndas nÃ¤sta gÃ¥ng \"dccm\" startas (nÃ¤sta gÃ¥ng du "
>+"LÃ¶senordet kommer att anvÃ¤ndas nÃ¤sta gÃ¥ng \"vdccm\" startas (nÃ¤sta gÃ¥ng du "
> "loggar in).\n"
> " \n"
> "LÃ¶senordet kommer att lagras som vanlig text. Detta betyder att det kan "
>diff -urN synce-trayicon-0.9.0.orig/src/gtop_stuff.c synce-trayicon-0.9.0/src/gtop_stuff.c
>--- synce-trayicon-0.9.0.orig/src/gtop_stuff.c	2007-02-12 17:02:39.000000000 -0800
>+++ synce-trayicon-0.9.0/src/gtop_stuff.c	2007-02-12 17:05:23.000000000 -0800
>@@ -57,7 +57,7 @@
> 
> 
> gboolean
>-dccm_is_running () {
>+vdccm_is_running () {
> 	glibtop_proclist proclist;
> 	unsigned *pid_list;
> 	gint i = 0;
>@@ -67,7 +67,7 @@
> 
> 	glibtop_init ();
> 	
>-	/* dccm skall kÃ¶ras som user */
>+	/* vdccm skall kÃ¶ras som user */
> 	which = GLIBTOP_KERN_PROC_UID;
> 	arg = getuid ();
> 	pid_list = glibtop_get_proclist (&proclist, which, arg);
>@@ -84,7 +84,7 @@
> 		glibtop_get_proc_state (&procstate, pid_list[i]);
> 		arguments = glibtop_get_proc_args (&procargs, pid_list[i], 0);
> 		name = get_process_name (procstate.cmd, arguments);
>-		if (g_ascii_strncasecmp("dccm", name, 4) == 0) {
>+		if (g_ascii_strncasecmp("vdccm", name, 4) == 0) {
> 			result = TRUE;
> 			g_free(name);
> 			g_free(arguments);
>diff -urN synce-trayicon-0.9.0.orig/src/gtop_stuff.h synce-trayicon-0.9.0/src/gtop_stuff.h
>--- synce-trayicon-0.9.0.orig/src/gtop_stuff.h	2007-02-12 17:02:39.000000000 -0800
>+++ synce-trayicon-0.9.0/src/gtop_stuff.h	2007-02-12 17:06:44.000000000 -0800
>@@ -1,4 +1,4 @@
> #include<glib.h>
> 
> gboolean
>-dccm_is_running ();
>+vdccm_is_running ();
>diff -urN synce-trayicon-0.9.0.orig/src/synce-trayicon.c synce-trayicon-0.9.0/src/synce-trayicon.c
>--- synce-trayicon-0.9.0.orig/src/synce-trayicon.c	2007-02-12 17:02:39.000000000 -0800
>+++ synce-trayicon-0.9.0/src/synce-trayicon.c	2007-02-12 17:06:16.000000000 -0800
>@@ -196,7 +196,7 @@
> 
> static void menu_disconnect(GtkWidget *button, EggTrayIcon *icon)
> {
>-	system("killall -HUP dccm");
>+	system("killall -HUP vdccm");
> }
> 
> static void
>@@ -511,10 +511,10 @@
>             GTK_SIGNAL_FUNC (gtk_main_quit), NULL);
> }
> 
>-void start_dccm ()
>+void start_vdccm ()
> {	
> 	char *argv[3] = {
>-		"dccm","-p",""
>+		"vdccm","-p",""
> 	};
> 	char argc = 1;
> 
>@@ -526,14 +526,14 @@
> 		argc = 3;
> 	}
> 
>-	if (!dccm_is_running()) {
>-		synce_trace("starting dccm");
>+	if (!vdccm_is_running()) {
>+		synce_trace("starting vdccm");
> 		if (gnome_execute_async(NULL,argc, argv) == -1) {
>-			synce_error_dialog(_("Can't start dccm which is needed to comunicate \nwith the PDA. Make sure it is installed and try again."));
>-			synce_trace("Failed to start dccm");
>+			synce_error_dialog(_("Can't start vdccm which is needed to comunicate \nwith the PDA. Make sure it is installed and try again."));
>+			synce_trace("Failed to start vdccm");
> 		}
> 	} else {
>-		synce_trace("dccm is already running!");
>+		synce_trace("vdccm is already running!");
> 	}
> }
> 
>@@ -583,7 +583,7 @@
> 			NULL);
> 
> 	
>-	start_dccm();
>+	start_vdccm();
> 	tray_icon = egg_tray_icon_new ("SynCE");
> 	box = gtk_event_box_new();
> 	icon = gtk_image_new();

Actions: View | Diff

Attachments on bug 202764: 147942 | 147944 | 147952 | 147953