gftp.yaz: src/gtk/bookmarks.c comparison

comparison src/gtk/bookmarks.c @ 7:5551ab2301fe

* Fixed a DND crash * When running a SSH bookmark, make sure need_userpass is enabled for that connection * moved anonymous ftp stuff from gtk port to rfc959.c * call bind_textdomain_codeset in gtk+ port * translation fixes for menus (from Owen Taylor <otaylor@redhat.com>)

author	masneyb
date	Fri, 23 Aug 2002 12:40:44 +0000
parents	8b1883341c6f
children	3b2dcdefc7e9

comparison

equal deleted inserted replaced

-:5678b5179c35
+:5551ab2301fe
 }
 if (!gftp_protocols[i].name)
 gftp_protocols[0].init (current_wdata->request);
+/* If we're using one of the SSH protocols, override the value of
+ssh_need_userpass in the config file */
+if (strncmp (tempentry->protocol, "SSH", 3) == 0)
+current_wdata->request->need_userpass = 1;
 ftp_connect (current_wdata, current_wdata->request, 1);
 }
 void
 add_bookmark (gpointer data)
 edttxt = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (current_wdata->combo)->entry));
 tempentry->remote_dir = g_malloc (strlen (edttxt) + 1);
 strcpy (tempentry->remote_dir, edttxt);
-if ((edttxt = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (useredit)->entry))) == NULL)
+if ((edttxt = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (useredit)->entry))) != NULL)
-{
-tempentry->user = g_malloc (10);
-strcpy (tempentry->user, "anonymous");
-tempentry->pass = g_malloc (strlen (emailaddr) + 1);
-strcpy (tempentry->pass, emailaddr);
-}
-else
 {
 tempentry->user = g_malloc (strlen (edttxt) + 1);
 strcpy (tempentry->user, edttxt);
 edttxt = gtk_entry_get_text (GTK_ENTRY (passedit));
 tempentry->save_password = GTK_TOGGLE_BUTTON (data->checkbox)->active;
 }
 add_to_bookmark (tempentry);
-test.path = g_strconcat (_("/Bookmarks/"), tempentry->path, NULL);
+test.path = g_strconcat ("/Bookmarks/", tempentry->path, NULL);
 gtk_item_factory_create_item (factory, &test, (gpointer) tempentry->path,
 				1);
 g_free (test.path);
 gftp_write_config_file ();
 }
 gftp_bookmarks * tempentry;
 tempentry = bookmarks->children;
 while (tempentry != NULL)
 {
-test.path = g_strconcat (_("/Bookmarks/"), tempentry->path, NULL);
+test.path = g_strconcat ("/Bookmarks/", tempentry->path, NULL);
 if (tempentry->isfolder)
 {
 test.item_type = "<Branch>";
 test.callback = NULL;
 }
 void
 edit_bookmarks (gpointer data)
 {
 GtkWidget * dialog, * scroll, * tempwid;
 GtkItemFactory * ifactory;
-GtkItemFactoryEntry dummy_item, menu_items[] = {
+GtkItemFactoryEntry menu_items[] = {
 {N_("/_File"), NULL, 0, 0, "<Branch>"},
 {N_("/File/tearoff"), NULL, 0, 0, "<Tearoff>"},
 {N_("/File/New Folder..."), NULL, new_folder_entry, 0},
 {N_("/File/New Item..."), NULL, new_item_entry, 0},
 {N_("/File/Delete"), NULL, delete_entry, 0},
 {N_("/File/Properties..."), NULL, edit_entry, 0},
 {N_("/File/sep"), NULL, 0, 0, "<Separator>"},
 {N_("/File/Close"), NULL, gtk_widget_destroy, 0}
 };
-int i;
 new_bookmarks = copy_bookmarks (bookmarks);
 new_bookmarks_htable = build_bookmarks_hash_table (new_bookmarks);
 dialog = gtk_dialog_new ();
 gtk_window_set_title (GTK_WINDOW (dialog), _("Edit Bookmarks"));
 gtk_window_set_wmclass (GTK_WINDOW(dialog), "Edit Bookmarks", "gFTP");
 gtk_box_set_spacing (GTK_BOX (GTK_DIALOG (dialog)->action_area), 15);
 gtk_window_set_position (GTK_WINDOW (dialog), GTK_WIN_POS_MOUSE);
-ifactory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<bookmarks>", NULL);
+ifactory = item_factory_new (GTK_TYPE_MENU_BAR, "<bookmarks>", NULL, NULL);
 create_item_factory (ifactory, 7, menu_items, NULL);
 create_item_factory (ifactory, 1, menu_items + 7, dialog);
 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), ifactory->widget,
 		      FALSE, FALSE, 0);
 gtk_widget_show (ifactory->widget);
 gtk_box_pack_start (GTK_BOX (GTK_DIALOG (dialog)->vbox), scroll, TRUE, TRUE,
 		      0);
 gtk_container_border_width (GTK_CONTAINER (scroll), 3);
 gtk_widget_show (scroll);
-edit_factory = gtk_item_factory_new (GTK_TYPE_MENU, "<edit_bookmark>", NULL);
+edit_factory = item_factory_new (GTK_TYPE_MENU, "<edit_bookmark>", NULL, "/File");
-for (i = 2; i < 8; i++)
-{
+create_item_factory (edit_factory, 6, menu_items + 2, dialog);
-memcpy (&dummy_item, menu_items + i, sizeof (dummy_item));
-dummy_item.path = strrchr (_(dummy_item.path), '/');
-gtk_item_factory_create_item (edit_factory, &dummy_item, dialog, 1);
-}
 tree = gtk_ctree_new (1, 0);
 gtk_clist_set_selection_mode (GTK_CLIST (tree), GTK_SELECTION_BROWSE);
 gtk_clist_set_reorderable (GTK_CLIST (tree), 1);
 gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scroll), tree);
 tempentry = bookmarks->children;
 while (tempentry != NULL)
 {
 if (tempentry->path && !tempentry->isfolder)
 	{
-	  tempstr = g_strdup_printf (_("/Bookmarks/%s"), tempentry->path);
+	  tempstr = g_strdup_printf ("/Bookmarks/%s", tempentry->path);
 gtk_widget_destroy (gtk_item_factory_get_item (factory, tempstr));
 	  g_free (tempentry->path);
 	  g_free (tempstr);
 	}
 if (tempentry->hostname)
 		{
 		  delentry = tempentry;
 		  tempentry = tempentry->prev;
 		  if (delentry->isfolder)
 		    {
-		      tempstr = g_strdup_printf (_("/Bookmarks/%s"),
+		      tempstr = g_strdup_printf ("/Bookmarks/%s",
 delentry->path);
 gtk_widget_destroy (gtk_item_factory_get_item (factory,
 tempstr));
 		      g_free (tempstr);
 		      g_free (delentry->path);
 		}
 	      delentry = tempentry;
 	      tempentry = tempentry->next;
 	      if (delentry->isfolder && tempentry != NULL)
 		{
-		  tempstr = g_strdup_printf (_("/Bookmarks/%s"),
+		  tempstr = g_strdup_printf ("/Bookmarks/%s",
 delentry->path);
 gtk_widget_destroy (gtk_item_factory_get_item (factory,
 tempstr));
 		  g_free (delentry->path);
 		  g_free (tempstr);

Mercurial > gftp.yaz

comparison src/gtk/bookmarks.c @ 7:5551ab2301fe