X-Git-Url: http://dolda2000.com/gitweb/?a=blobdiff_plain;f=clients%2Fgtk2%2Fmain.c;h=25c0c2197d02919c5555cfdc299d9072bc4324c1;hb=415daf6cc585d1d704a76897bd1c15c7ebab0d6d;hp=8191bc74fb604fded29ec3bdc65fbfc1d2a266a3;hpb=ab9f4164104fa1a78d7d61163f45c45011610ace;p=doldaconnect.git

diff --git a/clients/gtk2/main.c b/clients/gtk2/main.c
index 8191bc7..25c0c21 100644
--- a/clients/gtk2/main.c
+++ b/clients/gtk2/main.c
@@ -107,7 +107,10 @@ void cb_main_srchcanbtn_clicked(GtkWidget *widget, gpointer data);
 gboolean cb_main_trlist_keypress(GtkWidget *widget, GdkEventKey *event, gpointer data);
 void cb_main_filternoslots_toggled(GtkToggleButton *widget, gpointer data);
 void cb_main_srhash_activate(GtkWidget *widget, gpointer data);
+void cb_main_srcopy_activate(GtkWidget *widget, gpointer data);
 void cb_main_trhash_activate(GtkWidget *widget, gpointer data);
+void cb_main_trcopy_activate(GtkWidget *widget, gpointer data);
+void cb_main_trcancel_activate(GtkWidget *widget, gpointer data);
 gboolean cb_main_srpopup(GtkWidget *widget, GdkEventButton *event, gpointer data);
 gboolean cb_main_trpopup(GtkWidget *widget, GdkEventButton *event, gpointer data);
 void dcfdcallback(gpointer data, gint source, GdkInputCondition condition);
@@ -845,7 +848,15 @@ gint ksupdatecb(gpointer data)
 	}
     }
     if(oldnum != numspeeds)
-	knownspeeds = srealloc(knownspeeds, numspeeds * sizeof(*knownspeeds));
+    {
+	if(numspeeds == 0)
+	{
+	    free(knownspeeds);
+	    knownspeeds = NULL;
+	} else {
+	    knownspeeds = srealloc(knownspeeds, numspeeds * sizeof(*knownspeeds));
+	}
+    }
     gtk_tree_model_foreach(GTK_TREE_MODEL(srchmodel), ksupdaterow, NULL);
     if(ksqueryseq == -2)
     {
@@ -1191,22 +1202,27 @@ void cb_main_sdmenu_activate(GtkWidget *widget, gpointer data)
 void cb_main_fnaddr_activate(GtkWidget *widget, gpointer data)
 {
     int tag;
-    char *buf;
     struct dc_response *resp;
+    wchar_t **toks;
     
     if(dcfd < 0)
     {
 	msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Not connected to DC server"));
 	return;
     }
-    buf = sstrdup(gtk_entry_get_text(GTK_ENTRY(main_fnaddr)));
-    if(strchr(buf, ':') == NULL)
+    toks = dc_lexsexpr(icsmbstowcs((char *)gtk_entry_get_text(GTK_ENTRY(main_fnaddr)), "UTF-8", NULL));
+    if(*toks == NULL)
     {
-	buf = srealloc(buf, strlen(buf) + 5);
-	strcat(buf, ":411");
+	msgbox(GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _("Illegal address entered"));
+	return;
     }
-    tag = dc_queuecmd(NULL, NULL, L"cnct", L"dc", L"%%s", buf, NULL);
-    free(buf);
+    if(wcschr(toks[0], L':') == NULL)
+    {
+	toks[0] = srealloc(toks[0], (wcslen(toks[0]) + 5) * sizeof(wchar_t));
+	wcscat(toks[0], L":411");
+    }
+    tag = dc_queuecmd(NULL, NULL, L"cnct", L"dc", L"%%a", toks, NULL);
+    dc_freewcsarr(toks);
     if((resp = dc_gettaggedrespsync(tag)) != NULL)
     {
 	if(resp->code == 502)
@@ -1659,8 +1675,8 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
     GtkTreeIter iter;
     GtkTreeModel *model;
     int size, num;
-    char *tfnet, *tpeerid, *tfilename, *arg;
-    wchar_t *fnet, *peerid, *filename;
+    char *tfnet, *tpeerid, *tfilename, *thash, *arg;
+    wchar_t *fnet, *peerid, *filename, *hash;
     
     if(dcfd < 0)
     {
@@ -1673,10 +1689,11 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
     gtk_tree_model_get(model, &iter, 7, &num, -1);
     if(num > 0)
 	return;
-    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &tfnet, 1, &tpeerid, 3, &tfilename, 4, &size, -1);
+    gtk_tree_model_get(GTK_TREE_MODEL(model), &iter, 0, &tfnet, 1, &tpeerid, 3, &tfilename, 4, &size, 9, &thash, -1);
     fnet = icmbstowcs(tfnet, "UTF-8");
     peerid = icmbstowcs(tpeerid, "UTF-8");
     filename = icmbstowcs(tfilename, "UTF-8");
+    hash = (thash == NULL)?NULL:icmbstowcs(thash, "UTF-8");
     if((fnet == NULL) || (peerid == NULL) || (filename == NULL))
     {
 	if(fnet != NULL)
@@ -1685,9 +1702,13 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
 	    free(peerid);
 	if(filename != NULL)
 	    free(filename);
+	if(hash != NULL)
+	    free(hash);
 	g_free(tfnet);
 	g_free(tpeerid);
 	g_free(tfilename);
+	if(thash != NULL)
+	    g_free(thash);
 	return;
     }
     g_free(tfnet);
@@ -1695,12 +1716,14 @@ void cb_main_srchres_activate(GtkWidget *widget, GtkTreePath *path, GtkTreeViewC
     g_free(tfilename);
     arg = (char *)gtk_entry_get_text(GTK_ENTRY(main_dlarg));
     if(*arg)
-	tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, L"user", L"%%s", arg, NULL);
+	tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, L"hash", L"%%ls", (hash == NULL)?L"":hash, L"user", L"%%s", arg, NULL);
     else
-	tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, NULL);
+	tag = dc_queuecmd(NULL, NULL, L"download", fnet, L"%%ls", peerid, L"%%ls", filename, L"%%i", size, L"hash", L"%%ls", (hash == NULL)?L"":hash, NULL);
     free(fnet);
     free(peerid);
     free(filename);
+    if(hash != NULL)
+	free(hash);
     if((resp = dc_gettaggedrespsync(tag)) != NULL)
     {
 	if(resp->code == 502)
@@ -1754,6 +1777,25 @@ void cb_main_srhash_activate(GtkWidget *widget, gpointer data)
     }
 }
 
+void cb_main_srcopy_activate(GtkWidget *widget, gpointer data)
+{
+    GtkClipboard *cb;
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash;
+    
+    if(nextsrch != -1)
+	return;
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_srchres));
+    if(!gtk_tree_selection_get_selected(sel, &model, &iter))
+	return;
+    gtk_tree_model_get(model, &iter, 9, &hash, -1);
+    cb = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+    gtk_clipboard_set_text(cb, hash, -1);
+    g_free(hash);
+}
+
 void cb_main_trhash_activate(GtkWidget *widget, gpointer data)
 {
     GtkTreeSelection *sel;
@@ -1777,6 +1819,52 @@ void cb_main_trhash_activate(GtkWidget *widget, gpointer data)
     }
 }
 
+void cb_main_trcopy_activate(GtkWidget *widget, gpointer data)
+{
+    GtkClipboard *cb;
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    char *hash;
+    
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_downloads));
+    if(!gtk_tree_selection_get_selected(sel, &model, &iter))
+	return;
+    gtk_tree_model_get(model, &iter, 12, &hash, -1);
+    cb = gtk_clipboard_get(gdk_atom_intern("PRIMARY", FALSE));
+    gtk_clipboard_set_text(cb, hash, -1);
+    g_free(hash);
+}
+
+void cb_main_trcancel_activate(GtkWidget *widget, gpointer data)
+{
+    GtkTreeSelection *sel;
+    GtkTreeModel *model;
+    GtkTreeIter iter;
+    int id, tag;
+    struct dc_response *resp;
+    
+    if(nextsrch != -1)
+	return;
+    sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(main_downloads));
+    if(gtk_tree_selection_get_selected(sel, &model, &iter))
+    {
+	gtk_tree_model_get(model, &iter, 0, &id, -1);
+	tag = dc_queuecmd(NULL, NULL, L"cancel", L"%%i", id, NULL);
+	if((resp = dc_gettaggedrespsync(tag)) != NULL)
+	{
+	    if(resp->code == 502)
+		msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("You do not have permission to do that"));
+	    else if(resp->code != 200)
+		msgbox(GTK_MESSAGE_WARNING, GTK_BUTTONS_OK, _("An error occurred while trying to cancel (%i)"), resp->code);
+	    dc_freeresp(resp);
+	}
+	handleresps();
+    } else {
+	return;
+    }
+}
+
 /* XXX: This is quite a hack, since the calling convention is
  * different for the popup-menu sig and the button-press-event sig. It
  * most certainly works, but I don't know how portable it is. */
@@ -1794,9 +1882,13 @@ gboolean cb_main_srpopup(GtkWidget *widget, GdkEventButton *event, gpointer data
     {
 	gtk_tree_model_get(model, &iter, 9, &hash, -1);
 	if((nextsrch != -1) || (hash == NULL) || (*hash == 0))
+	{
 	    gtk_widget_set_sensitive(main_srhash, FALSE);
-	else
+	    gtk_widget_set_sensitive(main_srcopy, FALSE);
+	} else {
 	    gtk_widget_set_sensitive(main_srhash, TRUE);
+	    gtk_widget_set_sensitive(main_srcopy, TRUE);
+	}
 	g_free(hash);
     } else {
 	return(FALSE);
@@ -1823,9 +1915,13 @@ gboolean cb_main_trpopup(GtkWidget *widget, GdkEventButton *event, gpointer data
     {
 	gtk_tree_model_get(model, &iter, 12, &hash, -1);
 	if((nextsrch != -1) || (hash == NULL) || (*hash == 0))
+	{
 	    gtk_widget_set_sensitive(main_trhash, FALSE);
-	else
+	    gtk_widget_set_sensitive(main_trcopy, FALSE);
+	} else {
 	    gtk_widget_set_sensitive(main_trhash, TRUE);
+	    gtk_widget_set_sensitive(main_trcopy, TRUE);
+	}
 	g_free(hash);
     } else {
 	return(FALSE);