Enlightenment CVS committal
Author : chaos
Project : e17
Module : proto
Dir : e17/proto/entropy/src/plugins
Modified Files:
Makefile.am etk_list_viewer.c
Log Message:
* Fix warnings
* Add delete confirmation dialog
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/Makefile.am,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -3 -r1.45 -r1.46
--- Makefile.am 28 Jul 2007 23:41:40 -0000 1.45
+++ Makefile.am 2 Aug 2007 03:30:32 -0000 1.46
@@ -129,7 +129,8 @@
$(top_srcdir)/src/dialogs/etk_directory_add_dialog.c \
$(top_srcdir)/src/dialogs/etk_properties_dialog.c \
$(top_srcdir)/src/dialogs/etk_file_context_menu.c \
-
$(top_srcdir)/src/dialogs/etk_file_rename_dialog.c
+
$(top_srcdir)/src/dialogs/etk_file_rename_dialog.c \
+
$(top_srcdir)/src/dialogs/etk_interaction_dialog.c
etk_list_la_CFLAGS = @ETK_CFLAGS@
etk_list_la_LDFLAGS = -module -avoid-version
etk_list_la_LIBADD = @ETK_LIBS@
@@ -140,7 +141,8 @@
$(top_srcdir)/src/dialogs/etk_directory_add_dialog.c \
$(top_srcdir)/src/dialogs/etk_file_context_menu.c \
$(top_srcdir)/src/dialogs/etk_file_rename_dialog.c \
-
$(top_srcdir)/src/dialogs/etk_properties_dialog.c
+
$(top_srcdir)/src/dialogs/etk_properties_dialog.c \
+
$(top_srcdir)/src/dialogs/etk_interaction_dialog.c
etk_iconbox_la_CFLAGS = @ETK_CFLAGS@
etk_iconbox_la_LDFLAGS = -module -avoid-version
etk_iconbox_la_LIBADD = @ETK_LIBS@
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -3 -r1.85 -r1.86
--- etk_list_viewer.c 28 Jul 2007 12:35:23 -0000 1.85
+++ etk_list_viewer.c 2 Aug 2007 03:30:32 -0000 1.86
@@ -6,6 +6,7 @@
#include <time.h>
#include <Etk.h>
#include "entropy_etk_context_menu.h"
+#include "etk_user_interaction_dialog.h"
#include "etk_properties_dialog.h"
#define EN_DND_COL_NUM 5
@@ -96,12 +97,12 @@
/* Compares two rows of the tree */
-static int _entropy_etk_list_type_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_type_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
int val;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -116,13 +117,13 @@
}
}
-static int _entropy_etk_list_filename_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_filename_compare_cb( Etk_Tree_Col *col,
Etk_Tree_Row *row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
int val;
int presort_folder;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -149,11 +150,11 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_size_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_size_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -172,11 +173,11 @@
}
/* Compares two rows of the tree */
-static int _entropy_etk_list_date_compare_cb(Etk_Tree *tree, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, Etk_Tree_Col *col, void *data)
+static int _entropy_etk_list_date_compare_cb(Etk_Tree_Col *col, Etk_Tree_Row
*row1, Etk_Tree_Row *row2, void *data)
{
gui_file *file1, *file2;
- if (!tree || !row1 || !row2 || !col)
+ if (!row1 || !row2 || !col)
return 0;
file1 = ecore_hash_get(etk_list_viewer_row_hash, row1);
@@ -217,7 +218,7 @@
if (file) {
printf("Deleting '%s'...\n", file->file->filename);
- entropy_plugin_filesystem_file_remove(file->file,
(entropy_gui_component_instance*)data);
+ entropy_etk_delete_dialog_new(file->file,
(entropy_gui_component_instance*)data);
}
}
@@ -525,8 +526,8 @@
Etk_Tree_Col* col5;
char buffer[50];
char date_buffer[26];
- char* thumbnail_filename;
- char* thumbnail_key;
+ const char* thumbnail_filename;
+ const char* thumbnail_key;
viewer = instance->data;
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
