[Cxplorer-cvs 00885] CVS update: cxplorer/src

Back to archive index

Yasumichi Akahoshi yasum****@users*****
2005年 2月 9日 (水) 23:23:43 JST


Index: cxplorer/src/actcalls.c
diff -u cxplorer/src/actcalls.c:1.25 cxplorer/src/actcalls.c:1.26
--- cxplorer/src/actcalls.c:1.25	Wed Feb  9 23:16:19 2005
+++ cxplorer/src/actcalls.c	Wed Feb  9 23:23:43 2005
@@ -22,7 +22,7 @@
  * GtkButton on toolbar.
  * @author  Yasumichi Akahoshi <yasum****@users*****>
  * @date Fri Jun 11 00:16:18 2004
- * $Revision: 1.25 $
+ * $Revision: 1.26 $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -138,6 +138,8 @@
 		gtk_dialog_run (GTK_DIALOG (dialog));
 
 		gtk_widget_destroy (dialog);
+		
+		g_free (fullpath);
 	}
 }
 
@@ -149,35 +151,18 @@
  */
 void on_copy_activate (GtkWidget * gwCaller, gpointer user_data)
 {
-	/*
 	Cxplorer *cxplorer;
-	gchar *gcFullPath;
-	GtkClipboard *gcBoard;
-	GtkWidget *gwFileListView;
-	GtkTreeIter gtiCurrent;
-	GtkTreeModel *gtmModel;
-	GtkTreePath *gtpPath;
+	gchar *fullpath;
+	GtkClipboard *clipboard;
 
 	cxplorer = (Cxplorer *) user_data;
 
-	gwFileListView = cxplorer->gwFileListView;
-	gtk_tree_view_get_cursor (GTK_TREE_VIEW (gwFileListView), &gtpPath,
-				  NULL);
-
-	if (gtpPath)
+	if ((fullpath = cxp_right_pane_get_active_file_name(CXP_RIGHT_PANE(cxplorer->right_pane)))!=NULL)
 	{
-		gtmModel =
-			gtk_tree_view_get_model (GTK_TREE_VIEW
-						 (gwFileListView));
-		gtk_tree_model_get_iter (gtmModel, &gtiCurrent, gtpPath);
-		gtk_tree_model_get (gtmModel, &gtiCurrent, FVC_FILE_PATH,
-				    &gcFullPath, -1);
-		gcBoard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
-		gtk_clipboard_set_text (gcBoard, gcFullPath, -1);
-		g_free (gcFullPath);
-		gtk_tree_path_free (gtpPath);
+		clipboard = gtk_clipboard_get (GDK_SELECTION_PRIMARY);
+		gtk_clipboard_set_text (clipboard, fullpath, -1);
+		g_free (fullpath);
 	}
-	*/
 }
 
 /**


Cxplorer-cvs メーリングリストの案内
Back to archive index