Enlightenment CVS committal

Author  : chaos
Project : e17
Module  : proto

Dir     : e17/proto/entropy/src/plugins


Modified Files:
        etk_icon_viewer.c etk_list_viewer.c etk_structure_viewer.c 
        layout_etk_simple.c 


Log Message:
* New ETK API fixup

===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_icon_viewer.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- etk_icon_viewer.c   16 Aug 2006 01:20:53 -0000      1.13
+++ etk_icon_viewer.c   24 Aug 2006 23:18:03 -0000      1.14
@@ -194,7 +194,7 @@
   entropy_etk_iconbox_viewer *viewer;
   entropy_generic_file* file;
   Etk_Iconbox_Icon* icon;
-  Etk_Event_Mouse_Up_Down *event;
+  Etk_Event_Mouse_Down *event;
 
   instance = data;
   viewer = instance->data;
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_list_viewer.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -3 -r1.69 -r1.70
--- etk_list_viewer.c   16 Aug 2006 01:20:53 -0000      1.69
+++ etk_list_viewer.c   24 Aug 2006 23:18:03 -0000      1.70
@@ -191,7 +191,7 @@
 /* Called when the user presses a key */
 static void _etk_entropy_list_viewer_key_down_cb(Etk_Object *object, void 
*event, void *data)
 {
-   Etk_Event_Key_Up_Down *key_event = event;
+   Etk_Event_Key_Down *key_event = event;
 
    Etk_Tree* tree;
    Evas_List* row_list;
@@ -394,7 +394,7 @@
 }
 
 
-static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row 
*row, Etk_Event_Mouse_Up_Down *event, void *data)
+static void _etk_list_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row 
*row, Etk_Event_Mouse_Down *event, void *data)
 {
    entropy_gui_component_instance* instance;
    entropy_etk_file_list_viewer* viewer;
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/etk_structure_viewer.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- etk_structure_viewer.c      6 Aug 2006 10:01:10 -0000       1.27
+++ etk_structure_viewer.c      24 Aug 2006 23:18:03 -0000      1.28
@@ -4,7 +4,7 @@
 #include <limits.h>
 #include <Etk.h>
 #include "etk_progress_dialog.h"
-#include "entropy_etk_context_menu.h";
+#include "entropy_etk_context_menu.h"
 
 static int etk_callback_setup = 0;
 static Ecore_Hash* instance_map_hash = NULL;
@@ -120,7 +120,7 @@
    }
 }
 
-static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row 
*row, Etk_Event_Mouse_Up_Down *event, void *data)
+static void _etk_structure_viewer_row_clicked(Etk_Object *object, Etk_Tree_Row 
*row, Etk_Event_Mouse_Down *event, void *data)
 {
    entropy_gui_component_instance* instance;
    entropy_etk_file_structure_viewer* viewer;
===================================================================
RCS file: /cvs/e/e17/proto/entropy/src/plugins/layout_etk_simple.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -3 -r1.55 -r1.56
--- layout_etk_simple.c 16 Aug 2006 01:20:53 -0000      1.55
+++ layout_etk_simple.c 24 Aug 2006 23:18:03 -0000      1.56
@@ -191,7 +191,7 @@
 }
 
 static void _etk_layout_row_clicked(Etk_Object *object, 
-               Etk_Tree_Row *row, Etk_Event_Mouse_Up_Down *event, void *data)
+               Etk_Tree_Row *row, Etk_Event_Mouse_Down *event, void *data)
 {
        entropy_gui_component_instance* instance = data;
        entropy_layout_gui* gui = instance->data;       
@@ -358,13 +358,14 @@
 void
 _entropy_etk_layout_key_down_cb(Etk_Object *object, void *event, void *data)
 {
-   Etk_Event_Key_Up_Down *ev;
+   Etk_Event_Key_Down *ev;
    entropy_gui_component_instance* instance = data;
    entropy_layout_gui* gui = instance->data;
 
    ev = event;
 
-   if(evas_key_modifier_is_set(ev->modifiers, "Control"))
+   /*FIXME: How do we do modifiers now?*/
+   /*if(evas_key_modifier_is_set(ev->modifiers, "Control"))
    {
           if (!strcmp(ev->key, "q")) {
                   layout_etk_simple_quit(instance->core);
@@ -378,7 +379,7 @@
           }
 
   
-   }
+   }*/
    
 }
 



-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs

Reply via email to