PageRenderTime 39ms CodeModel.GetById 14ms RepoModel.GetById 0ms app.codeStats 0ms

/recipes/tsclient/tsclient-0.132/fixes.patch

https://github.com/Martix/Eonos
Patch | 332 lines | 306 code | 26 blank | 0 comment | 0 complexity | b0a9c7a117177b3f3b0d187aa619df68 MD5 | raw file
    

  1. # tsclient patch 
    2. 

  2. # Copyright (C) 2004, Advanced Micro Devices, Inc.  All Rights Reserved
    3. 

  3. # Released under the GPL license 
    4. 

  4. 

  5. diff -urN tsclient-0.132/Makefile.am tsclient-0.132.diff/Makefile.am
    6. 

  6. --- tsclient-0.132/Makefile.am	2003-11-08 16:21:32.000000000 -0700
    7. 

  7. +++ tsclient-0.132.diff/Makefile.am	2004-08-24 16:53:40.000000000 -0600
    8. 

  8. @@ -1,6 +1,6 @@
    9. 

  9.  ## Process this file with automake to produce Makefile.in
    10. 

  10.  
    11. 

  11. -SUBDIRS = src applet po
    12. 

  12. +SUBDIRS = @SDIRS@ 
    13. 

  13.  
    14. 

  14.  appicondir = $(datadir)/pixmaps
    15. 

  15.  appicon_DATA = tsclient.png
    16. 

  16. diff -urN tsclient-0.132/configure.in tsclient-0.132.diff/configure.in
    17. 

  17. --- tsclient-0.132/configure.in	2003-11-09 00:09:31.000000000 -0700
    18. 

  18. +++ tsclient-0.132.diff/configure.in	2004-08-24 16:57:35.000000000 -0600
    19. 

  19. @@ -12,8 +12,30 @@
    20. 

  20.  AM_PROG_CC_STDC
    21. 

  21.  AC_HEADER_STDC
    22. 

  22.  
    23. 

  23. -pkg_modules="libgnomeui-2.0"
    24. 

  24. -pkg_modules="libpanelapplet-2.0"
    25. 

  25. +SDIRS="src"
    26. 

  26. +
    27. 

  27. +dnl Once libgnomeui disappears, this is all we need
    28. 

  28. +pkg_modules="gtk+-2.0 gdk-pixbuf-2.0"
    29. 

  29. +
    30. 

  30. +AC_ARG_WITH(applet, [   --without-applet  Don't build the panel applet ],
    31. 

  31. +withapplet=no, withapplet=yes)
    32. 

  32. +
    33. 

  33. +echo "With applet: $withapplet"
    34. 

  34. +
    35. 

  35. +if test "$withapplet" != "no"; then 
    36. 

  36. +	pkg_modules="$pkg_modules libpanelapplet-2.0"
    37. 

  37. +	SDIRS="$SDIRS applet"
    38. 

  38. +fi
    39. 

  39. +
    40. 

  40. +AC_ARG_WITH(ica, [   --without-ica   Don't build in support for the ICA client ],
    41. 

  41. +withica=no, withica=yes)
    42. 

  42. +
    43. 

  43. +if test "$withica" != "no"; then 
    44. 

  44. +   CFLAGS="$CFLAGS -DENABLE_ICA"
    45. 

  45. +fi
    46. 

  46. +
    47. 

  47. +SDIRS="$SDIRS po"
    48. 

  48. +
    49. 

  49.  PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
    50. 

  50.  AC_SUBST(PACKAGE_CFLAGS)
    51. 

  51.  AC_SUBST(PACKAGE_LIBS)
    52. 

  52. @@ -41,6 +63,8 @@
    53. 

  53.          AC_MSG_RESULT(no)
    54. 

  54.  fi
    55. 

  55.  
    56. 

  56. +AC_SUBST(SDIRS)
    57. 

  57. +
    58. 

  58.  dnl ==========================================================================
    59. 

  59.  
    60. 

  60.  AC_OUTPUT([
    61. 

  61. diff -urN tsclient-0.132/src/connect.c tsclient-0.132.diff/src/connect.c
    62. 

  62. --- tsclient-0.132/src/connect.c	2003-11-08 19:45:43.000000000 -0700
    63. 

  63. +++ tsclient-0.132.diff/src/connect.c	2004-08-24 16:57:53.000000000 -0600
    64. 

  64. @@ -460,6 +460,7 @@
    65. 

  65.    gtk_widget_ref (miProtocol);
    66. 

  66.    if (!g_find_program_in_path ("Xnest")) { gtk_widget_set_sensitive (miProtocol, FALSE); }
    67. 

  67.  
    68. 

  68. +#ifdef ENABLE_ICA
    69. 

  69.    miProtocol = gtk_menu_item_new_with_mnemonic ("ICA");
    70. 

  70.    gtk_container_add (GTK_CONTAINER (mnuProtocol), miProtocol);
    71. 

  71.    gtk_tooltips_set_tip (tooltips, miProtocol, _("ICA protocol is used to connect to Citrix servers."), NULL);
    72. 

  72. @@ -468,6 +469,7 @@
    73. 

  73.    if (!g_find_program_in_path ("wfica") &&
    74. 

  74.        !g_file_test ("/usr/lib/ICAClient/wfica", G_FILE_TEST_EXISTS) )
    75. 

  75.      { gtk_widget_set_sensitive (miProtocol, FALSE); }
    76. 

  76. +#endif
    77. 

  77.  
    78. 

  78.    gtk_option_menu_set_menu (GTK_OPTION_MENU (optProtocol), mnuProtocol);
    79. 

  79.  
    80. 

  80. diff -urN tsclient-0.132/src/rdpfile.c tsclient-0.132.diff/src/rdpfile.c
    81. 

  81. --- tsclient-0.132/src/rdpfile.c	2003-11-08 19:41:58.000000000 -0700
    82. 

  82. +++ tsclient-0.132.diff/src/rdpfile.c	2004-08-24 16:53:40.000000000 -0600
    83. 

  83. @@ -585,7 +585,7 @@
    84. 

  84.    widget = lookup_widget (main_window, "optSize2");
    85. 

  85.    if (gtk_toggle_button_get_active ((GtkToggleButton *) widget)) {
    86. 

  86.      widget = lookup_widget (main_window, "optSize");
    87. 

  87. -    if ((int) gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) > 0) {
    88. 

  88. +    if ((int) gtk_option_menu_get_history (GTK_OPTION_MENU (widget)) >= 0) {
    89. 

  89.        switch ((int) gtk_option_menu_get_history (GTK_OPTION_MENU (widget))) {
    90. 

  90.        case 0:
    91. 

  91.          rdp->desktopwidth = 640;
    92. 

  92. diff -urN tsclient-0.132/src/support.c tsclient-0.132.diff/src/support.c
    93. 

  93. --- tsclient-0.132/src/support.c	2003-11-09 00:12:17.000000000 -0700
    94. 

  94. +++ tsclient-0.132.diff/src/support.c	2004-08-24 16:57:46.000000000 -0600
    95. 

  95. @@ -13,7 +13,7 @@
    96. 

  96.  #include <gtk/gtk.h>
    97. 

  97.  #include <gdk/gdk.h>
    98. 

  98.  #include <glib.h>
    99. 

  99. -#include <libgnomeui/gnome-about.h>
    100. 

  100. +#include <gtk/gtkdialog.h>
    101. 

  101.  
    102. 

  102.  #include <libintl.h>
    103. 

  103.  #define _(x) gettext(x)
    104. 

  104. @@ -528,7 +528,9 @@
    105. 

  105.        //buffer[strlen(buffer)-2] = '\0';
    106. 

  106.        c_argv[c_argc++] = strdup(buffer);
    107. 

  107.  
    108. 

  108. -    } else if (rdp->protocol == 3) {
    109. 

  109. +    }
    110. 

  110. +#ifdef ENABLE_ICA
    111. 

  111. + else if (rdp->protocol == 3) {
    112. 

  112.        // ICA/Citrix Connection
    113. 

  113.        if (g_find_program_in_path ("wfica")) {
    114. 

  114.          cmd = "wfica";
    115. 

  115. @@ -542,21 +544,25 @@
    116. 

  116.        c_argv[c_argc++] = g_strdup (buffer);
    117. 

  117.  
    118. 

  118.        if ( rdp->username && strlen (rdp->username) ) {
    119. 

  119. -        sprintf(buffer, "-username %s", (char*)g_strescape(rdp->username, NULL));
    120. 

  120. -        c_argv[c_argc++] = g_strdup (buffer);
    121. 

  121. +	sprintf(buffer, "-username");
    122. 

  122. +	c_argv[c_argc++] = g_strdup (buffer);
    123. 

  123. +	c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->username, NULL));
    124. 

  124.        }
    125. 

  125.        if ( rdp->password && strlen (rdp->password) ) {
    126. 

  126. -        sprintf(buffer, "-password %s", (char*)g_strescape(rdp->password, NULL));
    127. 

  127. -        c_argv[c_argc++] = g_strdup (buffer);
    128. 

  128. +	sprintf(buffer, "-password");
    129. 

  129. +	c_argv[c_argc++] = g_strdup (buffer);
    130. 

  130. +	c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->password, NULL));
    131. 

  131.        }
    132. 

  132.        if ( rdp->domain && strlen (rdp->domain) ) {
    133. 

  133. -        sprintf(buffer, "-domain %s", (char*)g_strescape(rdp->domain, NULL));
    134. 

  134. -        c_argv[c_argc++] = g_strdup (buffer);
    135. 

  135. +	sprintf(buffer, "-domain");
    136. 

  136. +	c_argv[c_argc++] = g_strdup (buffer);
    137. 

  137. +	c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->domain, NULL));
    138. 

  138.        }
    139. 

  139.  
    140. 

  140.        if ( rdp->client_hostname && strlen (rdp->client_hostname) ) {
    141. 

  141. -        sprintf(buffer, "-clientname %s", (char*)g_strescape(rdp->client_hostname, NULL));
    142. 

  142. -        c_argv[c_argc++] = g_strdup (buffer);
    143. 

  143. +	sprintf(buffer, "-clientname");
    144. 

  144. +	c_argv[c_argc++] = g_strdup (buffer);
    145. 

  145. +	c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->client_hostname, NULL));       
    146. 

  146.        }
    147. 

  147.  
    148. 

  148.        switch (rdp->desktopwidth) {
    149. 

  149. @@ -624,30 +630,24 @@
    150. 

  150.        }
    151. 

  151.  
    152. 

  152.        if (rdp->enable_alternate_shell == 1) {
    153. 

  153. -        if ( rdp->alternate_shell && strlen (rdp->alternate_shell) ) {
    154. 

  154. -          sprintf(buffer, "-program %s", (char*)g_strescape(rdp->alternate_shell, NULL));
    155. 

  155. -          c_argv[c_argc++] = g_strdup (buffer);
    156. 

  156. -        }
    157. 

  157. -
    158. 

  158. -        if ( rdp->shell_working_directory && strlen (rdp->shell_working_directory) ) {
    159. 

  159. -          sprintf(buffer, "-directory %s", (char*)g_strescape(rdp->shell_working_directory, NULL));
    160. 

  160. -          c_argv[c_argc++] = g_strdup (buffer);
    161. 

  161. -        }
    162. 

  162. +	sprintf(buffer, "-program");
    163. 

  163. +	c_argv[c_argc++] = g_strdup (buffer);
    164. 

  164. +	c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->alternate_shell, NULL));    
    165. 

  165.        }
    166. 

  166. -
    167. 

  167. -      if (strlen(rdp->proto_file) && g_file_test (rdp->proto_file, G_FILE_TEST_EXISTS)) {
    168. 

  168. -        sprintf(buffer, "-passwd");
    169. 

  169. -        c_argv[c_argc++] = g_strdup (buffer);
    170. 

  170. -        sprintf(buffer, "%s", (char*)g_strescape(rdp->proto_file, NULL));
    171. 

  171. -        c_argv[c_argc++] = g_strdup (buffer);
    172. 

  172. +      
    173. 

  173. +      if ( rdp->shell_working_directory && strlen (rdp->shell_working_directory) ) {
    174. 

  174. +	sprintf(buffer, "-directory");
    175. 

  175. +	c_argv[c_argc++] = g_strdup (buffer);
    176. 

  176. +	c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->shell_working_directory, NULL));    
    177. 

  177.        }
    178. 

  178.  
    179. 

  179.        if ( rdp->full_address && strlen (rdp->full_address) ) {
    180. 

  180. -        sprintf(buffer, "-description %s", (char*)g_strescape(rdp->full_address, NULL));
    181. 

  181. -        c_argv[c_argc++] = g_strdup (buffer);
    182. 

  182. +	sprintf(buffer, "-desc");
    183. 

  183. +	c_argv[c_argc++] = g_strdup (buffer);
    184. 

  184. +	c_argv[c_argc++] = g_strdup ((char *)g_strescape(rdp->full_address, NULL));    
    185. 

  185.        }
    186. 

  186. -		
    187. 

  187. -    }
    188. 

  188. + }
    189. 

  189. +#endif
    190. 

  190.  
    191. 

  191.      c_argv[c_argc++] = NULL;
    192. 

  192.      
    193. 

  193. @@ -663,7 +663,10 @@
    194. 

  194.        }
    195. 

  195.        if (std_err && strlen(std_err)) {
    196. 

  196.          g_warning ("\n%s\n", std_err);
    197. 

  197. -        tsc_error_message ((gchar*)std_err);
    198. 

  198. +	/* Note - this is a stupid and irresponsible thing to do - 
    199. 

  199. +	Really, this needs to be handled more intellegently 
    200. 

  200. +	*/
    201. 

  201. +        /* tsc_error_message ((gchar*)std_err); */
    202. 

  202.        }
    203. 

  203.      } else {
    204. 

  204.        if (!g_spawn_async (NULL, (gchar**)c_argv, NULL, G_SPAWN_SEARCH_PATH,
    205. 

  205. @@ -733,47 +736,82 @@
    206. 

  206.    gtk_widget_show_all (dialog);
    207. 

  207.  }
    208. 

  208.  
    209. 

  209. +static void 
    210. 

  210. +update_label(GtkWidget *label, const gchar *str) {
    211. 

  211. +  GString *string;
    212. 

  212. +
    213. 

  213. +  gchar *tmp = g_markup_escape_text (str, -1);
    214. 

  214. +
    215. 

  215. +  string = g_string_new (NULL);
    216. 

  216. +  g_string_append(string, tmp);
    217. 

  217. +  gtk_label_set_markup (GTK_LABEL (label), string->str);
    218. 

  218. +  g_string_free (string, TRUE);
    219. 

  219. +}
    220. 

  220. +
    221. 

  221. +void tsc_about_dialog() {
    222. 

  222. +  GtkWidget *about = NULL;
    223. 

  223. +  GtkWidget *name_label, *comments_label, *copyright_label;
    224. 

  224. +  GtkWidget *logo_image;
    225. 

  225. +  GtkWidget *vbox;
    226. 

  226.  
    227. 

  227. -void tsc_about_dialog ()
    228. 

  228. -{
    229. 

  229. -  static GtkWidget *about = NULL;
    230. 

  230. -  const gchar *name      = _("Terminal Server Client");
    231. 

  231. -  const gchar *version   = VERSION;
    232. 

  232. -  const gchar *copyright = "(C) 2003 Erick Woods\n<http://www.gnomepro.com/tsclient/>";
    233. 

  233. -  const gchar *authors[] = { "Erick Woods <erick@gnomepro.com>", NULL };
    234. 

  234. -  const gchar *documenters[] = { NULL };
    235. 

  235. -  const gchar *translator_credits = NULL;
    236. 

  236.    GdkPixbuf *pixbuf = create_pixbuf ("tsclient.png");
    237. 

  237.  
    238. 

  238. -  const gchar *comments = \
    239. 

  239. -    "Terminal Server Client is a frontend for \nrdesktop <http://www.rdesktop.org/> \nand vncviewer.\n" \
    240. 

  240. -    "\n" \
    241. 

  241. -    "Terminal Server Client is licensed under the \n" \
    242. 

  242. -    "GNU General Public License (GPL)\n<http://www.gnu.org/licenses/gpl.html>\n" \
    243. 

  243. -    "\n" \
    244. 

  244. -    "Images by: Jakub \"jimmac\" Steiner and others.";
    245. 

  245. +  about = gtk_dialog_new_with_buttons (_("About"),
    246. 

  246. +				       NULL,
    247. 

  247. +				       GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT,
    248. 

  248. +				       GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
    249. 

  249. +				       NULL);
    250. 

  250.    
    251. 

  251. -  if (about) {
    252. 

  252. -    gtk_window_present (GTK_WINDOW (about));
    253. 

  253. -    return;
    254. 

  254. -  }
    255. 

  255. +  vbox = gtk_vbox_new (FALSE, 8);
    256. 

  256. +  gtk_container_set_border_width (GTK_CONTAINER (vbox), 5);
    257. 

  257.    
    258. 

  258. -  about = gnome_about_new ( 
    259. 

  259. -        name,
    260. 

  260. -        version,
    261. 

  261. -        copyright,
    262. 

  262. -        comments, 
    263. 

  263. -        authors, 
    264. 

  264. -        documenters, 
    265. 

  265. -        translator_credits,  
    266. 

  266. -        pixbuf);
    267. 

  267. +  gtk_box_pack_start (GTK_BOX (GTK_DIALOG (about)->vbox), vbox, TRUE, TRUE, 0);
    268. 

  268.    
    269. 

  269. -  //gtk_window_set_wmclass (GTK_WINDOW (about), "terminal server client", "Terminal Server Client");
    270. 

  270. -  g_signal_connect (G_OBJECT (about), "destroy", G_CALLBACK (gtk_widget_destroyed), &about);
    271. 

  271. -  gtk_widget_show_all (about);  
    272. 

  272. -  return;
    273. 

  273. -}
    274. 

  274. +  logo_image = gtk_image_new ();
    275. 

  275. +  gtk_box_pack_start (GTK_BOX (vbox), logo_image, FALSE, FALSE, 0);
    276. 

  276.  
    277. 

  277. +  if (pixbuf)
    278. 

  278. +    gtk_image_set_from_pixbuf (GTK_IMAGE (logo_image), pixbuf);
    279. 

  279. +  
    280. 

  280. +  name_label = gtk_label_new (NULL);
    281. 

  281. +  gtk_label_set_selectable (GTK_LABEL (name_label), TRUE);
    282. 

  282. +  gtk_label_set_justify (GTK_LABEL (name_label), GTK_JUSTIFY_CENTER);
    283. 

  283. +  gtk_box_pack_start (GTK_BOX (vbox), name_label, FALSE, FALSE, 0);
    284. 

  284. +  
    285. 

  285. +  gtk_label_set_markup (GTK_LABEL (name_label), _("Terminal Server Client"));
    286. 

  286. +
    287. 

  287. +  comments_label = gtk_label_new (NULL);
    288. 

  288. +  gtk_label_set_selectable (GTK_LABEL (comments_label), TRUE);
    289. 

  289. +  gtk_label_set_justify (GTK_LABEL (comments_label), GTK_JUSTIFY_CENTER);
    290. 

  290. +  gtk_label_set_line_wrap (GTK_LABEL (comments_label), TRUE);
    291. 

  291. +  gtk_box_pack_start (GTK_BOX (vbox), comments_label, FALSE, FALSE, 0);
    292. 

  292. +
    293. 

  293. +  update_label(comments_label, "Terminal Server Client is a frontend for \nrdesktop " \
    294. 

  294. +	       "<http://www.rdesktop.org/> \nand vncviewer.\n" \
    295. 

  295. +	       "\n" \
    296. 

  296. +	       "Terminal Server Client is licensed under the \n" \
    297. 

  297. +	       "GNU General Public License (GPL)\n<http://www.gnu.org/licenses/gpl.html>\n" \
    298. 

  298. +	       "\n" \
    299. 

  299. +	       "Images by: Jakub \"jimmac\" Steiner and others.");
    300. 

  300. +  
    301. 

  301. +  copyright_label = gtk_label_new (NULL);
    302. 

  302. +  gtk_label_set_selectable (GTK_LABEL (copyright_label), TRUE);
    303. 

  303. +  gtk_label_set_justify (GTK_LABEL (copyright_label), GTK_JUSTIFY_CENTER);
    304. 

  304. +  gtk_box_pack_start (GTK_BOX (vbox), copyright_label, FALSE, FALSE, 0);
    305. 

  305. +
    306. 

  306. +  update_label(copyright_label, "(C) 2003 Erick Woods\n<http://www.gnomepro.com/tsclient/>");
    307. 

  307. +
    308. 

  308. +  gtk_widget_show_all (vbox);
    309. 

  309. +
    310. 

  310. +  gtk_window_set_resizable (GTK_WINDOW (about), FALSE);
    311. 

  311. +
    312. 

  312. +  g_signal_connect_swapped (GTK_OBJECT (about), 
    313. 

  313. +			    "response", 
    314. 

  314. +			    G_CALLBACK (gtk_widget_destroy),
    315. 

  315. +			    GTK_OBJECT (about));
    316. 

  316. +
    317. 

  317. +  gtk_widget_show_all (about);
    318. 

  318. +}
    319. 

  319.  
    320. 

  320.  void tsc_quick_pick_activate (GtkMenuItem *menuitem, gpointer user_data)
    321. 

  321.  {
    322. 

  322. @@ -847,8 +885,10 @@
    323. 

  323.      gtk_widget_set_sensitive ((GtkWidget*) g_object_get_data (G_OBJECT (main_win), "txtProgramPath"), FALSE);
    324. 

  324.      gtk_widget_set_sensitive ((GtkWidget*) g_object_get_data (G_OBJECT (main_win), "txtStartFolder"), FALSE);
    325. 

  325.      break;
    326. 

  326. +#ifdef ENABLE_ICA
    327. 

  327.    case 3:  // ica
    328. 

  328.      break;
    329. 

  329. +#endif
    330. 

  330.    default:
    331. 

  331.      break;
    332. 

  332.    }
    333. 

  333.