Enlightenment CVS committal
Author : moom
Project : e17
Module : proto
Dir : e17/proto/estickies/src/bin
Modified Files:
stickies.c
Log Message:
* Fix estickies
===================================================================
RCS file: /cvs/e/e17/proto/estickies/src/bin/stickies.c,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- stickies.c 25 Aug 2006 11:54:47 -0000 1.13
+++ stickies.c 7 Oct 2006 12:34:54 -0000 1.14
@@ -16,7 +16,7 @@
static void _e_sticky_focus_out_cb(Etk_Object *object, void *data);
static void _e_sticky_sticky_cb(Etk_Object *object, const char *property_name,
void *data);
static void _e_sticky_delete_confirm_cb(Etk_Object *obj, int response_id, void
*data);
-static void _e_sticky_clipboard_text_request_cb(Etk_Object *object, void
*event, void *data);
+static void _e_sticky_selection_text_request_cb(Etk_Object *object, void
*event, void *data);
static void
_e_sticky_key_down_cb(Etk_Object *object, void *event, void *data)
@@ -61,7 +61,7 @@
if(string && (text = etk_string_get(string)))
{
- etk_clipboard_text_set(s->textview, text, strlen(text) + 1);
+ etk_selection_text_set(ETK_SELECTION_CLIPBOARD, text);
etk_object_destroy(ETK_OBJECT(string));
}
@@ -71,7 +71,7 @@
}
else if(!strcmp(ev->key, "v"))
{
- etk_clipboard_text_request(ETK_WIDGET(s->win));
+ etk_selection_text_request(ETK_SELECTION_CLIPBOARD,
ETK_WIDGET(s->win));
}
else if(!strcmp(ev->key, "a"))
{
@@ -358,7 +358,7 @@
etk_container_add(ETK_CONTAINER(s->win), vbox);
etk_widget_focus(s->textview);
- etk_signal_connect("clipboard_received", ETK_OBJECT(s->win),
ETK_CALLBACK(_e_sticky_clipboard_text_request_cb), s);
+ etk_signal_connect("selection_received", ETK_OBJECT(s->win),
ETK_CALLBACK(_e_sticky_selection_text_request_cb), s);
}
E_Sticky *
@@ -555,16 +555,14 @@
etk_object_destroy(obj);
}
-static void _e_sticky_clipboard_text_request_cb(Etk_Object *object, void
*event, void *data)
+static void _e_sticky_selection_text_request_cb(Etk_Object *object, void
*event, void *data)
{
- Etk_Event_Selection_Request *ev;
- Etk_Selection_Data_Text *ev_text;
+ Etk_Selection_Event *ev = event;
Etk_Textblock_Iter *cursor;
Etk_Textblock_Iter *selection;
E_Sticky *s;
- ev = event;
- if(!(s = data) || !(ev_text = ev->data) || !(ev_text->text))
+ if(!(ev = event) || (ev->type != ETK_SELECTION_TEXT))
return;
cursor =
etk_textblock_object_cursor_get(ETK_TEXT_VIEW(s->textview)->textblock_object);
@@ -573,7 +571,7 @@
etk_textblock_delete_range(etk_text_view_textblock_get(ETK_TEXT_VIEW(s->textview)),
cursor, selection);
etk_textblock_insert(etk_text_view_textblock_get(ETK_TEXT_VIEW(s->textview)),
cursor,
- ev_text->text, strlen(ev_text->text));
+ ev->data.text, -1);
}
int main(int argc, char **argv)
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
