diff -u tsclient-0.150/debian/patches/25_hildoninterface.patch tsclient-0.150/debian/patches/25_hildoninterface.patch --- tsclient-0.150/debian/patches/25_hildoninterface.patch +++ tsclient-0.150/debian/patches/25_hildoninterface.patch @@ -1,6 +1,6 @@ -diff -Nur -x '*.orig' -x '*~' tsclient-0.150.ume/src/connect.c tsclient-0.150.ume.new/src/connect.c ---- tsclient-0.150.ume/src/connect.c 2008-03-31 16:43:07.000000000 -0300 -+++ tsclient-0.150.ume.new/src/connect.c 2008-03-31 16:43:42.000000000 -0300 +diff -Nur -x '*.orig' -x '*~' tsclient-0.150/src/connect.c tsclient-0.150.new/src/connect.c +--- tsclient-0.150/src/connect.c 2008-12-17 16:21:25.000000000 +0100 ++++ tsclient-0.150.new/src/connect.c 2008-12-17 16:22:07.000000000 +0100 @@ -74,12 +74,13 @@ GtkWidget *vbxCompact; @@ -52,42 +52,7 @@ gtk_box_pack_start (GTK_BOX (vbxComplete), nbkComplete, TRUE, TRUE, 0); gtk_container_set_border_width (GTK_CONTAINER (nbkComplete), 6); gtk_notebook_set_show_border (GTK_NOTEBOOK (nbkComplete), FALSE); -@@ -422,19 +428,19 @@ - - mnuProtocol = gtk_menu_new (); - -- miProtocol = gtk_menu_item_new_with_mnemonic ("RDP"); -- gtk_container_add (GTK_CONTAINER (mnuProtocol), miProtocol); -- gtk_tooltips_set_tip (tooltips, miProtocol, _("RDP protocol is used to connect to Microsoft Windows 2000 and older systems."), NULL); -- g_signal_connect (G_OBJECT (miProtocol), "activate", G_CALLBACK (on_protocol_changed), (int*)0); -- gtk_widget_ref (miProtocol); -- if (!g_find_program_in_path ("rdesktop")) { gtk_widget_set_sensitive (miProtocol, FALSE); } -- - miProtocol = gtk_menu_item_new_with_mnemonic ("RDPv5"); - gtk_container_add (GTK_CONTAINER (mnuProtocol), miProtocol); - gtk_tooltips_set_tip (tooltips, miProtocol, _("RDPv5 protocol is used to connect to Microsoft Windows XP and newer systems."), NULL); - g_signal_connect (G_OBJECT (miProtocol), "activate", G_CALLBACK (on_protocol_changed), (int*)4); - gtk_widget_ref (miProtocol); - if (!g_find_program_in_path ("rdesktop")) { gtk_widget_set_sensitive (miProtocol, FALSE); } -+ -+ miProtocol = gtk_menu_item_new_with_mnemonic ("RDP"); -+ gtk_container_add (GTK_CONTAINER (mnuProtocol), miProtocol); -+ gtk_tooltips_set_tip (tooltips, miProtocol, _("RDP protocol is used to connect to Microsoft Windows 2000 and older systems."), NULL); -+ g_signal_connect (G_OBJECT (miProtocol), "activate", G_CALLBACK (on_protocol_changed), (int*)0); -+ gtk_widget_ref (miProtocol); -+ if (!g_find_program_in_path ("rdesktop")) { gtk_widget_set_sensitive (miProtocol, FALSE); } - - miProtocol = gtk_menu_item_new_with_mnemonic ("VNC"); - gtk_container_add (GTK_CONTAINER (mnuProtocol), miProtocol); -@@ -562,7 +568,6 @@ - gtk_tooltips_set_tip (tooltips, optSize3, _("Work in full screen mode."), NULL); - gtk_radio_button_set_group (GTK_RADIO_BUTTON (optSize3), optSize1_group); - optSize1_group = gtk_radio_button_group (GTK_RADIO_BUTTON (optSize3)); -- - alnAltFullSwitch = gtk_alignment_new (0.5, 0.5, 0.88, 1); - gtk_box_pack_start (GTK_BOX (vbxSize), alnAltFullSwitch, FALSE, FALSE, 0); - gtk_widget_set_sensitive (alnAltFullSwitch, FALSE); -@@ -1040,8 +1045,10 @@ +@@ -1037,8 +1043,10 @@ HOOKUP_OBJECT (frmConnect, nbkComplete, "nbkComplete"); HOOKUP_OBJECT (frmConnect, vbxMain, "vbxMain"); @@ -98,7 +63,7 @@ // General Tab Widgets HOOKUP_OBJECT (frmConnect, lblGeneralTab1, "lblGeneralTab1"); -@@ -1344,7 +1351,6 @@ +@@ -1341,7 +1349,6 @@ gtk_widget_set_sensitive (aln_afss, TRUE); } @@ -106,9 +71,9 @@ void on_optColor1_clicked (GtkButton *button, gpointer user_data) -diff -Nur -x '*.orig' -x '*~' tsclient-0.150.ume/src/connect.h tsclient-0.150.ume.new/src/connect.h ---- tsclient-0.150.ume/src/connect.h 2008-03-31 16:42:03.000000000 -0300 -+++ tsclient-0.150.ume.new/src/connect.h 2008-03-31 16:43:08.000000000 -0300 +diff -Nur -x '*.orig' -x '*~' tsclient-0.150/src/connect.h tsclient-0.150.new/src/connect.h +--- tsclient-0.150/src/connect.h 2007-03-26 19:34:26.000000000 +0200 ++++ tsclient-0.150.new/src/connect.h 2008-12-17 16:21:26.000000000 +0100 @@ -20,6 +20,8 @@ void on_optSize3_clicked (GtkButton *button, gpointer user_data); @@ -118,10 +83,10 @@ void on_optColor1_clicked (GtkButton *button, gpointer user_data); void on_optColor2_clicked (GtkButton *button, gpointer user_data); -diff -Nur -x '*.orig' -x '*~' tsclient-0.150.ume/src/rdpfile.c tsclient-0.150.ume.new/src/rdpfile.c ---- tsclient-0.150.ume/src/rdpfile.c 2008-03-31 16:43:07.000000000 -0300 -+++ tsclient-0.150.ume.new/src/rdpfile.c 2008-03-31 16:43:08.000000000 -0300 -@@ -69,7 +69,11 @@ +diff -Nur -x '*.orig' -x '*~' tsclient-0.150/src/rdpfile.c tsclient-0.150.new/src/rdpfile.c +--- tsclient-0.150/src/rdpfile.c 2008-12-17 16:21:25.000000000 +0100 ++++ tsclient-0.150.new/src/rdpfile.c 2008-12-17 16:21:26.000000000 +0100 +@@ -70,7 +70,11 @@ rdp->redirectdrives = 0; rdp->redirectprinters = 0; rdp->redirectsmartcards = 0; @@ -133,7 +98,7 @@ rdp->session_bpp = 0; rdp->shell_working_directory = ""; rdp->username = ""; -@@ -614,7 +618,7 @@ +@@ -615,7 +619,7 @@ rdp->desktopwidth = 0; rdp->desktopheight = 0; } @@ -142,9 +107,9 @@ widget = lookup_widget (main_window, "optSize2"); if (gtk_toggle_button_get_active ((GtkToggleButton *) widget)) { widget = lookup_widget (main_window, "optSize"); -diff -Nur -x '*.orig' -x '*~' tsclient-0.150.ume/src/rdpfile.h tsclient-0.150.ume.new/src/rdpfile.h ---- tsclient-0.150.ume/src/rdpfile.h 2008-03-31 16:43:07.000000000 -0300 -+++ tsclient-0.150.ume.new/src/rdpfile.h 2008-03-31 16:43:08.000000000 -0300 +diff -Nur -x '*.orig' -x '*~' tsclient-0.150/src/rdpfile.h tsclient-0.150.new/src/rdpfile.h +--- tsclient-0.150/src/rdpfile.h 2008-12-17 16:21:25.000000000 +0100 ++++ tsclient-0.150.new/src/rdpfile.h 2008-12-17 16:21:26.000000000 +0100 @@ -58,6 +58,7 @@ char *shell_working_directory; char *username; diff -u tsclient-0.150/debian/changelog tsclient-0.150/debian/changelog --- tsclient-0.150/debian/changelog +++ tsclient-0.150/debian/changelog @@ -1,3 +1,9 @@ +tsclient (0.150-1ubuntu5) jaunty; urgency=low + + * Fix protocol inversion in protocol list(LP: #294271) + + -- Laurent Bigonville Wed, 17 Dec 2008 16:25:06 +0100 + tsclient (0.150-1ubuntu4) jaunty; urgency=low * 28_desktop_icon_allow_svg.patch: Don't specify the Icon extension, so