E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf
Modified Files:
e_conf.c
Log Message:
Subscribe to module update event. This will allow Config Panel to have
dynamic adds/dels when a module gets loaded/unloaded; ie: If you load module
that makes entries to Config Panel, then the Panel lists will dynamically be
updated with those entries.
===
RCS file: /cvs/e/e17/apps/e/src/modules/conf/e_conf.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_conf.c31 Oct 2007 13:30:19 - 1.4
+++ e_conf.c24 Nov 2007 10:12:36 - 1.5
@@ -22,6 +22,7 @@
Evas_Object *close;
Evas_List *cats;
+ Ecore_Event_Handler *mod_hdl;
};
struct _E_Configure_CB
@@ -57,6 +58,7 @@
static void _e_configure_focus_cb(void *data, Evas_Object *obj);
static void _e_configure_keydown_cb(void *data, Evas *e, Evas_Object *obj,
void *event);
static void _e_configure_fill_cat_list(void *data);
+static int _e_configure_module_update_cb(void *data, int type, void *event);
static E_Configure *_e_configure = NULL;
@@ -112,7 +114,11 @@
eco-win-data = eco;
eco-con = con;
eco-evas = e_win_evas_get(eco-win);
-
+
+ /* Event Handler for Module Updates */
+ eco-mod_hdl = ecore_event_handler_add(E_EVENT_MODULE_UPDATE,
+ _e_configure_module_update_cb, eco);
+
e_win_title_set(eco-win, _(Enlightenment Configuration));
e_win_name_class_set(eco-win, E, _configure);
e_win_dialog_set(eco-win, 1);
@@ -121,7 +127,8 @@
e_win_centered_set(eco-win, 1);
eco-edje = edje_object_add(eco-evas);
- e_theme_edje_object_set(eco-edje, base/theme/configure,
e/widgets/configure/main);
+ e_theme_edje_object_set(eco-edje, base/theme/configure,
+ e/widgets/configure/main);
eco-o_list = e_widget_list_add(eco-evas, 1, 1);
edje_object_part_swallow(eco-edje, e.swallow.content, eco-o_list);
@@ -184,6 +191,8 @@
{
if (_e_configure)
{
+ if (_e_configure-mod_hdl)
+ ecore_event_handler_del(_e_configure-mod_hdl);
e_object_del(E_OBJECT(_e_configure));
_e_configure = NULL;
}
@@ -461,6 +470,7 @@
evas_event_freeze(evas_object_evas_get(eco-cat_list));
edje_freeze();
e_widget_ilist_freeze(eco-cat_list);
+ e_widget_ilist_clear(eco-cat_list);
for (l = e_configure_registry; l; l = l-next)
{
@@ -492,4 +502,20 @@
e_widget_ilist_thaw(eco-cat_list);
edje_thaw();
evas_event_thaw(evas_object_evas_get(eco-cat_list));
+}
+
+static int
+_e_configure_module_update_cb(void *data, int type, void *event)
+{
+ E_Event_Module_Update *ev;
+ E_Configure *eco;
+ int sel = 0;
+
+ if (type != E_EVENT_MODULE_UPDATE) return 1;
+ eco = data;
+ if (!eco) return;
+ ev = event;
+ sel = e_widget_ilist_selected_get(eco-cat_list);
+ _e_configure_fill_cat_list(eco);
+ e_widget_ilist_selected_set(eco-cat_list, sel);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/modules/conf
Modified Files:
e_conf.c
Log Message:
Remove unused variable.
Add return values.
===
RCS file: /cvs/e/e17/apps/e/src/modules/conf/e_conf.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -3 -r1.5 -r1.6
--- e_conf.c24 Nov 2007 10:12:36 - 1.5
+++ e_conf.c24 Nov 2007 10:16:13 - 1.6
@@ -507,15 +507,14 @@
static int
_e_configure_module_update_cb(void *data, int type, void *event)
{
- E_Event_Module_Update *ev;
E_Configure *eco;
int sel = 0;
if (type != E_EVENT_MODULE_UPDATE) return 1;
eco = data;
- if (!eco) return;
- ev = event;
+ if (!eco) return 1;
sel = e_widget_ilist_selected_get(eco-cat_list);
_e_configure_fill_cat_list(eco);
e_widget_ilist_selected_set(eco-cat_list, sel);
+ return 1;
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/ewl_embed_test Modified Files: Makefile.am Log Message: be a bit more posix-conform (that fixes some build problems on openbsd) === RCS file: /cvs/e/e17/libs/ewl/data/themes/ewl_embed_test/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -3 -r1.3 -r1.4 --- Makefile.am 16 Nov 2007 18:57:51 - 1.3 +++ Makefile.am 24 Nov 2007 10:39:36 - 1.4 @@ -18,6 +18,6 @@ SUFFIXES = .edc .edj .edc.edj: - edje_cc -v -id $(top_srcdir)/data/themes/$(notdir $(:%.edc=%))/images $(top_srcdir)/data/themes/$(notdir $(:%.edc=%))/$ $(top_builddir)/data/themes/$(notdir $(:%.edc=%))/$(notdir $@) + edje_cc -v -id $(top_srcdir)/data/themes/$(*F)/images $(top_srcdir)/data/themes/$(*F)/$ $(top_builddir)/data/themes/$(*F)/$(@F) endif - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/ewl pfritz
Enlightenment CVS committal Author : pfritz Project : e17 Module : libs/ewl Dir : e17/libs/ewl/data/themes/e17 Modified Files: Makefile.am Log Message: be a bit more posix-conform (that fixes some build problems on openbsd) === RCS file: /cvs/e/e17/libs/ewl/data/themes/e17/Makefile.am,v retrieving revision 1.5 retrieving revision 1.6 diff -u -3 -r1.5 -r1.6 --- Makefile.am 2 Jan 2007 05:18:01 - 1.5 +++ Makefile.am 24 Nov 2007 10:39:36 - 1.6 @@ -50,5 +50,5 @@ SUFFIXES = .edc .edj .edc.edj: - edje_cc -v -id $(top_srcdir)/data/themes/$(notdir $(:%.edc=%))/images -fd $(top_srcdir)/data/themes/$(notdir $(:%.edc=%)) $(top_srcdir)/data/themes/$(notdir $(:%.edc=%))/$ $(top_builddir)/data/themes/$(notdir $(:%.edc=%))/$(notdir $@) + edje_cc -v -id $(top_srcdir)/data/themes/$(*F)/images -fd $(top_srcdir)/data/themes/$(*F) $(top_srcdir)/data/themes/$(*F)/$ $(top_builddir)/data/themes/$(*F)/$(@F) - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c
Log Message:
Interrupt hiding on mouse in.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -3 -r1.82 -r1.83
--- e_shelf.c 23 Nov 2007 12:03:00 - 1.82
+++ e_shelf.c 24 Nov 2007 12:31:15 - 1.83
@@ -130,6 +130,8 @@
es-handlers = evas_list_append(es-handlers,
ecore_event_handler_add(E_EVENT_ZONE_EDGE_IN, _e_shelf_cb_mouse_in,
es));
es-handlers = evas_list_append(es-handlers,
+ecore_event_handler_add(ECORE_X_EVENT_MOUSE_IN, _e_shelf_cb_mouse_in,
es));
+ es-handlers = evas_list_append(es-handlers,
ecore_event_handler_add(ECORE_X_EVENT_MOUSE_OUT,
_e_shelf_cb_mouse_out, es));
es-o_base = edje_object_add(es-evas);
@@ -1212,66 +1214,79 @@
static int
_e_shelf_cb_mouse_in(void *data, int type, void *event)
{
- E_Event_Zone_Edge_In *ev;
E_Shelf *es;
- int show = 0;
- ev = event;
es = data;
- switch (es-gadcon-orient)
+ edje_object_signal_emit(es-o_base, e,state,focused, e);
+ if (es-cfg-autohide_show_action) return 1;
+
+ if (type == E_EVENT_ZONE_EDGE_IN)
{
- case E_GADCON_ORIENT_LEFT:
-if ((ev-edge == E_ZONE_EDGE_LEFT) (ev-y = es-y) (ev-y =
(es-y + es-h)))
- show = 1;
-break;
- case E_GADCON_ORIENT_RIGHT:
-if ((ev-edge == E_ZONE_EDGE_RIGHT) (ev-y = es-y) (ev-y =
(es-y + es-h)))
- show = 1;
-break;
- case E_GADCON_ORIENT_TOP:
-if ((ev-edge == E_ZONE_EDGE_TOP) (ev-x = es-x) (ev-x =
(es-x + es-w)))
- show = 1;
-break;
- case E_GADCON_ORIENT_BOTTOM:
-if ((ev-edge == E_ZONE_EDGE_BOTTOM) (ev-x = es-x) (ev-x =
(es-x + es-w)))
- show = 1;
-break;
- case E_GADCON_ORIENT_CORNER_TL:
- case E_GADCON_ORIENT_CORNER_LT:
-if ((ev-edge == E_ZONE_EDGE_TOP) (ev-x = es-x) (ev-x =
(es-x + es-w)))
- show = 1;
-else if ((ev-edge == E_ZONE_EDGE_LEFT) (ev-y = es-y) (ev-y
= (es-y + es-h)))
- show = 1;
-break;
- case E_GADCON_ORIENT_CORNER_TR:
- case E_GADCON_ORIENT_CORNER_RT:
-if ((ev-edge == E_ZONE_EDGE_TOP) (ev-x = es-x) (ev-x =
(es-x + es-w)))
- show = 1;
-else if ((ev-edge == E_ZONE_EDGE_RIGHT) (ev-y = es-y) (ev-y
= (es-y + es-h)))
- show = 1;
-break;
- case E_GADCON_ORIENT_CORNER_BL:
- case E_GADCON_ORIENT_CORNER_LB:
-if ((ev-edge == E_ZONE_EDGE_BOTTOM) (ev-x = es-x) (ev-x =
(es-x + es-w)))
- show = 1;
-else if ((ev-edge == E_ZONE_EDGE_LEFT) (ev-y = es-y) (ev-y
= (es-y + es-h)))
- show = 1;
-break;
- case E_GADCON_ORIENT_CORNER_BR:
- case E_GADCON_ORIENT_CORNER_RB:
-if ((ev-edge == E_ZONE_EDGE_BOTTOM) (ev-x = es-x) (ev-x =
(es-x + es-w)))
- show = 1;
-else if ((ev-edge == E_ZONE_EDGE_RIGHT) (ev-y = es-y) (ev-y
= (es-y + es-h)))
- show = 1;
-break;
- default:
-break;
- }
+ E_Event_Zone_Edge_In *ev;
+ int show = 0;
- if (show)
+ ev = event;
+ switch (es-gadcon-orient)
+ {
+ case E_GADCON_ORIENT_LEFT:
+ if ((ev-edge == E_ZONE_EDGE_LEFT) (ev-y = es-y) (ev-y
= (es-y + es-h)))
+ show = 1;
+ break;
+ case E_GADCON_ORIENT_RIGHT:
+ if ((ev-edge == E_ZONE_EDGE_RIGHT) (ev-y = es-y) (ev-y
= (es-y + es-h)))
+ show = 1;
+ break;
+ case E_GADCON_ORIENT_TOP:
+ if ((ev-edge == E_ZONE_EDGE_TOP) (ev-x = es-x) (ev-x
= (es-x + es-w)))
+ show = 1;
+ break;
+ case E_GADCON_ORIENT_BOTTOM:
+ if ((ev-edge == E_ZONE_EDGE_BOTTOM) (ev-x = es-x)
(ev-x = (es-x + es-w)))
+ show = 1;
+ break;
+ case E_GADCON_ORIENT_CORNER_TL:
+ case E_GADCON_ORIENT_CORNER_LT:
+ if ((ev-edge == E_ZONE_EDGE_TOP) (ev-x = es-x) (ev-x
= (es-x + es-w)))
+ show = 1;
+ else if ((ev-edge == E_ZONE_EDGE_LEFT) (ev-y = es-y)
(ev-y = (es-y + es-h)))
+ show = 1;
+ break;
+ case E_GADCON_ORIENT_CORNER_TR:
+ case E_GADCON_ORIENT_CORNER_RT:
+ if ((ev-edge == E_ZONE_EDGE_TOP) (ev-x = es-x) (ev-x
= (es-x + es-w)))
+ show = 1;
+ else if ((ev-edge == E_ZONE_EDGE_RIGHT) (ev-y = es-y)
(ev-y = (es-y + es-h)))
+ show = 1;
+ break;
+ case E_GADCON_ORIENT_CORNER_BL:
+ case E_GADCON_ORIENT_CORNER_LB:
+ if ((ev-edge == E_ZONE_EDGE_BOTTOM) (ev-x = es-x)
(ev-x = (es-x + es-w)))
+
E CVS: apps/e englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_shelf.c
Log Message:
Always focus on mouse in, and only focus if we interract with the shelf.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_shelf.c,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -3 -r1.83 -r1.84
--- e_shelf.c 24 Nov 2007 12:31:15 - 1.83
+++ e_shelf.c 24 Nov 2007 12:35:20 - 1.84
@@ -1217,7 +1217,6 @@
E_Shelf *es;
es = data;
- edje_object_signal_emit(es-o_base, e,state,focused, e);
if (es-cfg-autohide_show_action) return 1;
if (type == E_EVENT_ZONE_EDGE_IN)
@@ -1276,7 +1275,11 @@
break;
}
- if (show) e_shelf_toggle(es, 1);
+ if (show)
+ {
+edje_object_signal_emit(es-o_base, e,state,focused, e);
+e_shelf_toggle(es, 1);
+ }
}
else if (type == ECORE_X_EVENT_MOUSE_IN)
{
@@ -1284,9 +1287,12 @@
ev = event;
/* If we are about to hide the shelf, interrupt on mouse in */
- if ((ev-win == es-win)
- ((es-hide_animator) || (es-instant_timer)))
- e_shelf_toggle(es, 1);
+ if (ev-win == es-win)
+ {
+edje_object_signal_emit(es-o_base, e,state,focused, e);
+if ((es-hide_animator) || (es-instant_timer))
+ e_shelf_toggle(es, 1);
+ }
}
return 1;
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/modules/conf Modified Files: e_conf.c Log Message: No need to check type if we only register to one event. === RCS file: /cvs/e/e17/apps/e/src/modules/conf/e_conf.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -3 -r1.6 -r1.7 --- e_conf.c24 Nov 2007 10:16:13 - 1.6 +++ e_conf.c24 Nov 2007 12:42:54 - 1.7 @@ -510,7 +510,6 @@ E_Configure *eco; int sel = 0; - if (type != E_EVENT_MODULE_UPDATE) return 1; eco = data; if (!eco) return 1; sel = e_widget_ilist_selected_get(eco-cat_list); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/e_dbus englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/lib/notification
Modified Files:
client.c daemon.c
Log Message:
No need to have both unref and close, only creates ambiguity.
===
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/notification/client.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- client.c4 Nov 2007 07:51:37 - 1.2
+++ client.c24 Nov 2007 13:22:03 - 1.3
@@ -23,7 +23,7 @@
e_notification_shutdown(void)
{
if (--init_count) return init_count;
- e_dbus_connection_unref(client_conn);
+ e_dbus_connection_close(client_conn);
client_conn = NULL;
e_dbus_shutdown();
return 0;
===
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/notification/daemon.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- daemon.c4 Nov 2007 07:51:37 - 1.2
+++ daemon.c24 Nov 2007 13:22:03 - 1.3
@@ -95,7 +95,7 @@
e_notification_daemon_free(E_Notification_Daemon *daemon)
{
if (daemon-obj) e_dbus_object_free(daemon-obj);
- if (daemon-conn) e_dbus_connection_unref(daemon-conn);
+ if (daemon-conn) e_dbus_connection_close(daemon-conn);
if (daemon-name) free(daemon-name);
if (daemon-vendor) free(daemon-vendor);
if (daemon-iface) e_dbus_interface_unref(daemon-iface);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_main.c Log Message: Even though we have e_dbus support, it isn't sure that we get a dbus connection. === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -3 -r1.37 -r1.38 --- e_fm_main.c 24 Nov 2007 13:22:03 - 1.37 +++ e_fm_main.c 24 Nov 2007 13:23:35 - 1.38 @@ -249,7 +249,7 @@ } #ifdef HAVE_EDBUS - e_dbus_connection_close(_e_dbus_conn); + if (_e_dbus_conn) e_dbus_connection_close(_e_dbus_conn); e_dbus_shutdown(); _e_storage_volume_edd_shutdown(); #endif - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e morlenxus
Enlightenment CVS committal
Author : morlenxus
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_order.c
Log Message:
--old todo comment
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_order.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_order.c 26 Jul 2007 12:29:52 - 1.27
+++ e_order.c 24 Nov 2007 13:26:20 - 1.28
@@ -263,8 +263,6 @@
}
else
{
-/* TODO: Check if the file is in ~/.e/e/applications/all */
-/* TODO: Consider copying the file to $XDG_DATA_HOME/applications
*/
fprintf(f, %s\n, desktop-orig_path);
}
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_msgbus.c Log Message: formatting === RCS file: /cvs/e/e17/apps/e/src/bin/e_msgbus.c,v retrieving revision 1.2 retrieving revision 1.3 diff -u -3 -r1.2 -r1.3 --- e_msgbus.c 25 Sep 2007 23:23:42 - 1.2 +++ e_msgbus.c 24 Nov 2007 13:27:49 - 1.3 @@ -142,7 +142,7 @@ restart = 1; ecore_main_loop_quit(); -return dbus_message_new_method_return(msg); + return dbus_message_new_method_return(msg); } static DBusMessage* - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/e_dbus englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/bin
Modified Files:
hal.c test.c
Log Message:
No need to have both unref and close, only creates ambiguity.
===
RCS file: /cvs/e/e17/libs/e_dbus/src/bin/hal.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- hal.c 29 Oct 2007 02:20:47 - 1.1
+++ hal.c 24 Nov 2007 13:22:03 - 1.2
@@ -822,7 +822,7 @@
#endif
ecore_list_destroy(storage_devices);
ecore_list_destroy(volumes);
- e_dbus_connection_unref(conn);
+ e_dbus_connection_close(conn);
e_dbus_shutdown();
ecore_string_shutdown();
ecore_shutdown();
===
RCS file: /cvs/e/e17/libs/e_dbus/src/bin/test.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -3 -r1.1 -r1.2
--- test.c 29 Oct 2007 02:20:47 - 1.1
+++ test.c 24 Nov 2007 13:22:03 - 1.2
@@ -93,7 +93,7 @@
if (conn)
{
if (_setup(conn)) ecore_main_loop_begin();
-e_dbus_connection_unref(conn);
+e_dbus_connection_close(conn);
}
e_dbus_shutdown();
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e englebass
Enlightenment CVS committal Author : englebass Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_fm_main.c Log Message: No need to have both unref and close, only creates ambiguity. === RCS file: /cvs/e/e17/apps/e/src/bin/e_fm_main.c,v retrieving revision 1.36 retrieving revision 1.37 diff -u -3 -r1.36 -r1.37 --- e_fm_main.c 6 Nov 2007 07:14:24 - 1.36 +++ e_fm_main.c 24 Nov 2007 13:22:03 - 1.37 @@ -249,7 +249,7 @@ } #ifdef HAVE_EDBUS - e_dbus_connection_unref(_e_dbus_conn); + e_dbus_connection_close(_e_dbus_conn); e_dbus_shutdown(); _e_storage_volume_edd_shutdown(); #endif - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/e_dbus englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/lib/dbus
Modified Files:
E_DBus.h e_dbus.c e_dbus_object.c
Log Message:
No need to have both unref and close, only creates ambiguity.
===
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/E_DBus.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- E_DBus.h6 Nov 2007 23:58:56 - 1.4
+++ E_DBus.h24 Nov 2007 13:22:03 - 1.5
@@ -69,7 +69,6 @@
EAPI E_DBus_Connection *e_dbus_bus_get(DBusBusType type);
EAPI void e_dbus_connection_ref(E_DBus_Connection *conn);
- EAPI void e_dbus_connection_unref(E_DBus_Connection *conn);
EAPI E_DBus_Connection *e_dbus_connection_setup(DBusConnection *conn);
EAPI void e_dbus_connection_close(E_DBus_Connection *conn);
===
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/e_dbus.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_dbus.c17 Nov 2007 03:26:08 - 1.3
+++ e_dbus.c24 Nov 2007 13:22:03 - 1.4
@@ -517,6 +517,8 @@
{
DEBUG(5, e_dbus_connection_close\n);
+ if (--(conn-refcount) != 0) return;
+
dbus_connection_free_data_slot(connection_slot);
dbus_connection_remove_filter(conn-conn, e_dbus_filter, NULL);
dbus_connection_set_watch_functions (conn-conn,
@@ -543,13 +545,6 @@
e_dbus_connection_ref(E_DBus_Connection *conn)
{
conn-refcount++;
-}
-
-EAPI void
-e_dbus_connection_unref(E_DBus_Connection *conn)
-{
- if (!conn) return;
- if (--(conn-refcount) == 0) e_dbus_connection_close(conn);
}
DBusConnection *
===
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/dbus/e_dbus_object.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_dbus_object.c 4 Nov 2007 07:51:37 - 1.2
+++ e_dbus_object.c 24 Nov 2007 13:22:03 - 1.3
@@ -236,7 +236,7 @@
DEBUG(5, e_dbus_object_free (%s)\n, obj-path);
dbus_connection_unregister_object_path(obj-conn-conn, obj-path);
- e_dbus_connection_unref(obj-conn);
+ e_dbus_connection_close(obj-conn);
if (obj-path) free(obj-path);
ecore_list_destroy(obj-interfaces);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: libs/e_dbus englebass
Enlightenment CVS committal
Author : englebass
Project : e17
Module : libs/e_dbus
Dir : e17/libs/e_dbus/src/lib/nm
Modified Files:
e_nm.c
Log Message:
No need to have both unref and close, only creates ambiguity.
===
RCS file: /cvs/e/e17/libs/e_dbus/src/lib/nm/e_nm.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_nm.c 4 Nov 2007 07:51:37 - 1.2
+++ e_nm.c 24 Nov 2007 13:22:03 - 1.3
@@ -24,7 +24,7 @@
EAPI void
e_nm_free(E_NM_Context *ctx)
{
- e_dbus_connection_unref(ctx-conn);
+ e_dbus_connection_close(ctx-conn);
free(ctx);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c Log Message: *sigh* Gadget containers can be other things besides Shelfs. Check for existance of shelf before calling shelf-specific functions. === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.91 retrieving revision 1.92 diff -u -3 -r1.91 -r1.92 --- e_gadcon.c 23 Nov 2007 11:49:27 - 1.91 +++ e_gadcon.c 25 Nov 2007 03:18:31 - 1.92 @@ -1159,7 +1159,8 @@ E_OBJECT_CHECK(gcc); E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE); - e_shelf_locked_set(gcc-gadcon-shelf, 1); + if (gcc-gadcon-shelf) + e_shelf_locked_set(gcc-gadcon-shelf, 1); e_menu_post_deactivate_callback_set(menu, _e_gadcon_client_cb_menu_post, gcc); if (!gcc-gadcon-toolbar) @@ -2165,7 +2166,8 @@ E_Gadcon_Client *gcc; gcc = data; - e_shelf_locked_set(gcc-gadcon-shelf, 0); + if (gcc-gadcon-shelf) + e_shelf_locked_set(gcc-gadcon-shelf, 0); if (!gcc-menu) return; e_object_del(E_OBJECT(gcc-menu)); gcc-menu = NULL; - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c Log Message: More shelf-specific checks before calling shelf-specific functions. === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.92 retrieving revision 1.93 diff -u -3 -r1.92 -r1.93 --- e_gadcon.c 25 Nov 2007 03:18:31 - 1.92 +++ e_gadcon.c 25 Nov 2007 03:25:26 - 1.93 @@ -1594,7 +1594,8 @@ zone = e_util_zone_current_get(e_manager_current_get()); - e_shelf_locked_set(gcc-gadcon-shelf, 1); + if (gcc-gadcon-shelf) + e_shelf_locked_set(gcc-gadcon-shelf, 1); mn = e_menu_new(); e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post, gcc); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: efm_nav devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : efm_nav
Dir : e_modules/efm_nav/src
Modified Files:
e_mod_main.c
Log Message:
Fix efm_nav menu.
===
RCS file: /cvs/e/e_modules/efm_nav/src/e_mod_main.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -3 -r1.2 -r1.3
--- e_mod_main.c20 Nov 2007 06:48:54 - 1.2
+++ e_mod_main.c25 Nov 2007 03:25:59 - 1.3
@@ -7,7 +7,6 @@
E_Gadcon_Client *gcc;
Evas_Object *o_base, *o_list;
Evas_Object *o_back, *o_up, *o_forward;
- E_Menu *menu;
E_Toolbar *tbar;
Ecore_List *history;
@@ -24,7 +23,6 @@
static const char *_gc_id_new(void);
static void _cb_mouse_down(void *data, Evas *e,
Evas_Object *obj, void *event_info);
-static void _cb_menu_post (void *data, E_Menu *mn);
static void _cb_back_click(void *data, Evas_Object *obj,
const char *emission,
const char *source);
@@ -232,27 +230,14 @@
inst = data;
ev = event_info;
- if ((ev-button != 3) || (inst-menu)) return;
+ if ((ev-button != 3) || (inst-gcc-menu)) return;
zone = e_util_zone_current_get(e_manager_current_get());
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _cb_menu_post, inst);
- inst-menu = mn;
e_gadcon_client_util_menu_items_append(inst-gcc, mn, 0);
ecore_x_pointer_xy_get(zone-container-win, x, y);
- e_menu_activate_mouse(inst-menu, zone, x, y, 1, 1,
+ e_menu_activate_mouse(mn, zone, x, y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev-timestamp);
e_util_evas_fake_mouse_up_later(e, ev-button);
-}
-
-static void
-_cb_menu_post(void *data, E_Menu *mn)
-{
- Instance *inst;
-
- inst = data;
- if (!inst-menu) return;
- e_object_del(E_OBJECT(inst-menu));
- inst-menu = NULL;
}
static void
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: efm_nav devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : efm_nav
Dir : e_modules/efm_nav/src
Modified Files:
e_mod_main.c
Log Message:
Remove unused variable.
===
RCS file: /cvs/e/e_modules/efm_nav/src/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c25 Nov 2007 03:25:59 - 1.3
+++ e_mod_main.c25 Nov 2007 03:29:02 - 1.4
@@ -125,7 +125,6 @@
_gc_shutdown(E_Gadcon_Client *gcc)
{
Instance *inst = NULL;
- const char *hist;
inst = gcc-data;
if (!inst) return;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: efm_path devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : efm_path
Dir : e_modules/efm_path/src
Modified Files:
e_mod_main.c
Log Message:
Fix efm_path menu.
===
RCS file: /cvs/e/e_modules/efm_path/src/e_mod_main.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.c20 Nov 2007 06:39:35 - 1.3
+++ e_mod_main.c25 Nov 2007 03:32:24 - 1.4
@@ -6,7 +6,6 @@
{
E_Gadcon_Client *gcc;
Evas_Object *o_entry, *o_base, *o_loc, *o_event;
- E_Menu *menu;
E_Toolbar *tbar;
char *path;
};
@@ -35,7 +34,6 @@
void *event_info);
static void _cb_mouse_down(void *data, Evas *e,
Evas_Object *obj, void *event_info);
-static void _cb_menu_post (void *data, E_Menu *m);
static Evas_List *instances = NULL;
static E_Module *path_mod = NULL;
@@ -115,12 +113,6 @@
inst = gcc-data;
if (!inst) return;
instances = evas_list_remove(instances, inst);
- if (inst-menu)
- {
- e_menu_post_deactivate_callback_set(inst-menu, NULL, NULL);
- e_object_del(E_OBJECT(inst-menu));
- inst-menu = NULL;
- }
evas_object_event_callback_del(inst-o_event, EVAS_CALLBACK_MOUSE_DOWN,
_cb_mouse_down);
evas_object_event_callback_del(inst-o_base, EVAS_CALLBACK_MOUSE_DOWN,
_cb_mouse_down);
@@ -331,28 +323,12 @@
inst = data;
ev = event_info;
- if ((ev-button != 3) || (inst-menu)) return;
+ if ((ev-button != 3) || (inst-gcc-menu)) return;
zone = e_util_zone_current_get(e_manager_current_get());
-
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _cb_menu_post, inst);
- inst-menu = mn;
e_gadcon_client_util_menu_items_append(inst-gcc, mn, 0);
ecore_x_pointer_xy_get(zone-container-win, x, y);
- e_menu_activate_mouse(inst-menu, zone, x, y, 1, 1,
+ e_menu_activate_mouse(mn, zone, x, y, 1, 1,
E_MENU_POP_DIRECTION_DOWN, ev-timestamp);
- evas_event_feed_mouse_up(inst-gcc-gadcon-evas, ev-button,
- EVAS_BUTTON_NONE, ev-timestamp, NULL);
-// e_util_evas_fake_mouse_up_later(e, ev-button);
-}
-
-static void
-_cb_menu_post(void *data, E_Menu *m)
-{
- Instance *inst;
-
- inst = data;
- if (!inst-menu) return;
- e_object_del(E_OBJECT(inst-menu));
- inst-menu = NULL;
+ e_util_evas_fake_mouse_up_later(e, ev-button);
}
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e17
Module : apps/e
Dir : e17/apps/e/src/bin
Modified Files:
e_gadcon.c
Log Message:
More gadcon-shelf checks before calling any shelf-specific functions.
===
RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -3 -r1.93 -r1.94
--- e_gadcon.c 25 Nov 2007 03:25:26 - 1.93
+++ e_gadcon.c 25 Nov 2007 04:15:50 - 1.94
@@ -1159,7 +1159,7 @@
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
- if (gcc-gadcon-shelf)
+ if (gcc-gadcon-shelf)
e_shelf_locked_set(gcc-gadcon-shelf, 1);
e_menu_post_deactivate_callback_set(menu, _e_gadcon_client_cb_menu_post,
gcc);
@@ -2188,8 +2188,9 @@
{
E_Menu *mn;
int cx, cy, cw, ch;
-
- e_shelf_locked_set(gcc-gadcon-shelf, 1);
+
+ if (gcc-gadcon-shelf)
+ e_shelf_locked_set(gcc-gadcon-shelf, 1);
mn = e_menu_new();
e_menu_post_deactivate_callback_set(mn, _e_gadcon_client_cb_menu_post,
gcc);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: tclock devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : tclock
Dir : e_modules/tclock
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix tclock menu for recent gadcon_client_util_menu_items_append breakage w/
shelf.
===
RCS file: /cvs/e/e_modules/tclock/e_mod_main.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.h31 Oct 2007 14:41:53 - 1.21
+++ e_mod_main.h25 Nov 2007 04:42:12 - 1.22
@@ -13,7 +13,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===
RCS file: /cvs/e/e_modules/tclock/e_mod_main.c,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -3 -r1.52 -r1.53
--- e_mod_main.c12 Nov 2007 04:15:53 - 1.52
+++ e_mod_main.c25 Nov 2007 04:42:12 - 1.53
@@ -22,7 +22,6 @@
/* Module Protos */
static void _tclock_cb_mouse_down (void *data, Evas *e,
Evas_Object *obj, void *event_info);
static void _tclock_menu_cb_configure (void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _tclock_menu_cb_post (void *data, E_Menu *m);
static int _tclock_cb_check (void *data);
static Config_Item *_tclock_config_item_get (const char *id);
@@ -106,9 +105,7 @@
ecore_timer_del (check_timer);
check_timer = NULL;
}
-
- free (inst);
- inst = NULL;
+ E_FREE(inst);
}
static void
@@ -159,15 +156,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!tclock_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _tclock_menu_cb_post, inst);
- tclock_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -183,22 +178,13 @@
e_util_zone_current_get (e_manager_current_get
()), x + ev-output.x,
y + ev-output.y, 1, 1,
-E_MENU_POP_DIRECTION_DOWN, ev-timestamp);
+E_MENU_POP_DIRECTION_AUTO, ev-timestamp);
evas_event_feed_mouse_up (inst-gcc-gadcon-evas, ev-button,
EVAS_BUTTON_NONE, ev-timestamp, NULL);
}
}
static void
-_tclock_menu_cb_post (void *data, E_Menu * m)
-{
- if (!tclock_config-menu)
-return;
- e_object_del (E_OBJECT (tclock_config-menu));
- tclock_config-menu = NULL;
-}
-
-static void
_tclock_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -387,12 +373,6 @@
if (tclock_config-config_dialog)
e_object_del (E_OBJECT (tclock_config-config_dialog));
- if (tclock_config-menu)
-{
- e_menu_post_deactivate_callback_set (tclock_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (tclock_config-menu));
- tclock_config-menu = NULL;
-}
while (tclock_config-items)
{
@@ -407,12 +387,10 @@
evas_stringshare_del (ci-time_format);
if (ci-date_format)
evas_stringshare_del (ci-date_format);
- free (ci);
- ci = NULL;
+ E_FREE(ci);
}
- free (tclock_config);
- tclock_config = NULL;
+ E_FREE(tclock_config);
E_CONFIG_DD_FREE (conf_item_edd);
E_CONFIG_DD_FREE (conf_edd);
return 1;
@@ -424,4 +402,3 @@
e_config_domain_save (module.tclock, conf_edd, tclock_config);
return 1;
}
-
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: screenshot devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : screenshot
Dir : e_modules/screenshot
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix screenshot menu for recent gadcon_menu_items_append mess.
===
RCS file: /cvs/e/e_modules/screenshot/e_mod_main.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.h31 Oct 2007 14:28:10 - 1.21
+++ e_mod_main.h25 Nov 2007 04:55:52 - 1.22
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
Ecore_Event_Handler *exe_exit_handler;
===
RCS file: /cvs/e/e_modules/screenshot/e_mod_main.c,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -3 -r1.78 -r1.79
--- e_mod_main.c12 Nov 2007 07:58:34 - 1.78
+++ e_mod_main.c25 Nov 2007 04:55:52 - 1.79
@@ -45,7 +45,6 @@
static void _ss_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _ss_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _ss_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_ss_config_item_get (const char *id);
static Screenshot *_ss_new (Evas * evas);
static void _ss_free (Screenshot * ss);
@@ -162,15 +161,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!ss_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _ss_menu_cb_post, inst);
- ss_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -186,7 +183,7 @@
e_util_zone_current_get (e_manager_current_get
()), x + ev-output.x,
y + ev-output.y, 1, 1,
-E_MENU_POP_DIRECTION_DOWN, ev-timestamp);
+E_MENU_POP_DIRECTION_AUTO, ev-timestamp);
evas_event_feed_mouse_up (inst-gcc-gadcon-evas, ev-button,
EVAS_BUTTON_NONE, ev-timestamp, NULL);
}
@@ -195,15 +192,6 @@
}
static void
-_ss_menu_cb_post (void *data, E_Menu * m)
-{
- if (!ss_config-menu)
-return;
- e_object_del (E_OBJECT (ss_config-menu));
- ss_config-menu = NULL;
-}
-
-static void
_ss_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -392,12 +380,6 @@
if (ss_config-config_dialog)
e_object_del (E_OBJECT (ss_config-config_dialog));
- if (ss_config-menu)
-{
- e_menu_post_deactivate_callback_set (ss_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (ss_config-menu));
- ss_config-menu = NULL;
-}
while (ss_config-items)
{
@@ -414,11 +396,9 @@
evas_stringshare_del (ci-app);
ss_config-items =
evas_list_remove_list (ss_config-items, ss_config-items);
- free (ci);
- ci = NULL;
+ E_FREE(ci);
}
- free (ss_config);
- ss_config = NULL;
+ E_FREE(ss_config);
E_CONFIG_DD_FREE (conf_item_edd);
E_CONFIG_DD_FREE (conf_edd);
return 1;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: alarm devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : alarm
Dir : e_modules/alarm
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix alarm for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/alarm/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h2 Nov 2007 12:22:16 - 1.3
+++ e_mod_main.h25 Nov 2007 05:01:29 - 1.4
@@ -134,7 +134,6 @@
E_Config_Dialog *config_dialog;
E_Config_Dialog *config_dialog_alarm_new;
Evas_List *instances;
- E_Menu *menu;
};
EAPI extern E_Module_Api e_modapi;
===
RCS file: /cvs/e/e_modules/alarm/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c12 Nov 2007 04:52:36 - 1.10
+++ e_mod_main.c25 Nov 2007 05:01:29 - 1.11
@@ -1,9 +1,9 @@
/*
* vim:ts=8:sw=3:sts=8:noexpandtab:cino=5n-3f0^-2{2
*/
-#include e.h
+#include e.h
#include e_mod_main.h
-#include config.h
+#include config.h
#define ALARM_ADD_FAIL(errcode) if (al) alarm_alarm_del(al); if (error) *error
= errcode; return NULL;
@@ -47,7 +47,6 @@
static double _epoch_find_date(char *date, int hour, int minute);
static double _epoch_find_next(int day_monday, int day_tuesday, int
day_wenesday, int day_thursday, int day_friday, int day_saturday, int
day_sunday, int hour, int minute);
static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object *obj,
void *event_info);
-static void _menu_cb_deactivate_post(void *data, E_Menu *m);
static void _menu_cb_alarm_snooze(void *data, E_Menu *m, E_Menu_Item *mi);
static void _menu_cb_alarm_add(void *data, E_Menu *m, E_Menu_Item *mi);
static void _menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
@@ -804,7 +803,7 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!alarm_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
@@ -812,8 +811,6 @@
int nb_snoozed = 0;
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _menu_cb_deactivate_post, inst);
- alarm_config-menu = mn;
/* snooze menu */
if (alarm_config-alarms_state == ALARM_STATE_RINGING)
@@ -881,14 +878,6 @@
}
static void
-_menu_cb_deactivate_post(void *data, E_Menu *m)
-{
- if (!alarm_config-menu) return;
- e_object_del(E_OBJECT(alarm_config-menu));
- alarm_config-menu = NULL;
-}
-
-static void
_menu_cb_alarm_snooze(void *data, E_Menu *m, E_Menu_Item *mi)
{
Alarm *al;
@@ -1151,11 +1140,6 @@
e_object_del(E_OBJECT(alarm_config-config_dialog));
if (alarm_config-config_dialog_alarm_new)
e_object_del(E_OBJECT(alarm_config-config_dialog_alarm_new));
- if (alarm_config-menu)
- {
- e_menu_post_deactivate_callback_set(alarm_config-menu , NULL, NULL);
- e_object_del(E_OBJECT(alarm_config-menu));
- }
E_FREE(alarm_config);
E_CONFIG_DD_FREE(_alarms_edd);
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: calendar devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : calendar
Dir : e_modules/calendar
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fixes for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/calendar/e_mod_main.h,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -3 -r1.3 -r1.4
--- e_mod_main.h20 Nov 2007 11:19:51 - 1.3
+++ e_mod_main.h25 Nov 2007 05:05:58 - 1.4
@@ -10,7 +10,6 @@
{
E_Module*module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===
RCS file: /cvs/e/e_modules/calendar/e_mod_main.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -3 -r1.12 -r1.13
--- e_mod_main.c20 Nov 2007 11:08:10 - 1.12
+++ e_mod_main.c25 Nov 2007 05:05:58 - 1.13
@@ -38,7 +38,6 @@
static void _cb_mouse_in(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _cb_mouse_out(void *data, Evas *e, Evas_Object *obj, void
*event_info);
static void _cb_mouse_down(void *data, Evas *e, Evas_Object *obj, void
*event_info);
-static void _menu_cb_post(void *data, E_Menu *m);
static int days_in_month[2][12] =
{
@@ -55,7 +54,8 @@
static const E_Gadcon_Client_Class _gc_class =
{
GADCON_CLIENT_CLASS_VERSION, calendar,
- {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new,
NULL}
+ {_gc_init, _gc_shutdown, _gc_orient, _gc_label, _gc_icon, _gc_id_new,
NULL},
+ E_GADCON_CLIENT_STYLE_PLAIN
};
static E_Gadcon_Client *
@@ -353,15 +353,12 @@
{
e_gadcon_popup_toggle_pinned(inst-popup);
}
- if ((ev-button == 3) (!calendar_conf-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
int cx, cy, cw, ch;
mn = e_menu_new();
- calendar_conf-menu = mn;
-
- e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst);
e_gadcon_client_util_menu_items_append(inst-gcc, mn, 0);
e_gadcon_canvas_zone_geometry_get(inst-gcc-gadcon, cx, cy, cw,
ch);
@@ -372,14 +369,6 @@
evas_event_feed_mouse_up(inst-gcc-gadcon-evas, ev-button,
EVAS_BUTTON_NONE, ev-timestamp, NULL);
}
-}
-
-static void
-_menu_cb_post(void *data, E_Menu *m)
-{
- if (!calendar_conf-menu) return;
- e_object_del(E_OBJECT(calendar_conf-menu));
- calendar_conf-menu = NULL;
}
EAPI E_Module_Api e_modapi =
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mail devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mail
Dir : e_modules/mail
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix mail module for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/mail/e_mod_main.h,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -3 -r1.16 -r1.17
--- e_mod_main.h31 Oct 2007 13:57:13 - 1.16
+++ e_mod_main.h25 Nov 2007 05:21:55 - 1.17
@@ -43,7 +43,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===
RCS file: /cvs/e/e_modules/mail/e_mod_main.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -3 -r1.53 -r1.54
--- e_mod_main.c12 Nov 2007 04:15:51 - 1.53
+++ e_mod_main.c25 Nov 2007 05:21:55 - 1.54
@@ -221,7 +221,7 @@
if (!inst)
return;
- if ((ev-button == 3) (!mail_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn, *sn;
E_Menu_Item *mi;
@@ -229,8 +229,6 @@
char buf[1024];
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _mail_menu_cb_post, inst);
- mail_config-menu = mn;
if ((inst-ci-boxes) (evas_list_count (inst-ci-boxes) 0))
{
@@ -276,7 +274,7 @@
e_util_zone_current_get (e_manager_current_get
()), x + ev-output.x,
y + ev-output.y, 1, 1,
-E_MENU_POP_DIRECTION_DOWN, ev-timestamp);
+E_MENU_POP_DIRECTION_AUTO, ev-timestamp);
evas_event_feed_mouse_up (inst-gcc-gadcon-evas, ev-button,
EVAS_BUTTON_NONE, ev-timestamp, NULL);
}
@@ -345,15 +343,6 @@
}
static void
-_mail_menu_cb_post (void *data, E_Menu * m)
-{
- if (!mail_config-menu)
-return;
- e_object_del (E_OBJECT (mail_config-menu));
- mail_config-menu = NULL;
-}
-
-static void
_mail_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst = data;
@@ -495,12 +484,6 @@
if (mail_config-config_dialog)
e_object_del (E_OBJECT (mail_config-config_dialog));
- if (mail_config-menu)
-{
- e_menu_post_deactivate_callback_set (mail_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (mail_config-menu));
- mail_config-menu = NULL;
-}
while (mail_config-items)
{
Config_Item *ci;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: apps/e devilhorns
Enlightenment CVS committal Author : devilhorns Project : e17 Module : apps/e Dir : e17/apps/e/src/bin Modified Files: e_gadcon.c Log Message: More thorough check on menu_post for shelf. === RCS file: /cvs/e/e17/apps/e/src/bin/e_gadcon.c,v retrieving revision 1.94 retrieving revision 1.95 diff -u -3 -r1.94 -r1.95 --- e_gadcon.c 25 Nov 2007 04:15:50 - 1.94 +++ e_gadcon.c 25 Nov 2007 05:36:54 - 1.95 @@ -2167,7 +2167,7 @@ E_Gadcon_Client *gcc; gcc = data; - if (gcc-gadcon-shelf) + if ((gcc-gadcon) (gcc-gadcon-shelf)) e_shelf_locked_set(gcc-gadcon-shelf, 0); if (!gcc-menu) return; e_object_del(E_OBJECT(gcc-menu)); - This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2005. http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/ ___ enlightenment-cvs mailing list enlightenment-cvs@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mixer devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mixer
Dir : e_modules/mixer
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -3 -r1.11 -r1.12
--- e_mod_main.h31 Oct 2007 14:11:55 - 1.11
+++ e_mod_main.h25 Nov 2007 05:37:18 - 1.12
@@ -10,7 +10,6 @@
{
E_Module*module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
===
RCS file: /cvs/e/e_modules/mixer/e_mod_main.c,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -3 -r1.70 -r1.71
--- e_mod_main.c20 Nov 2007 03:35:49 - 1.70
+++ e_mod_main.c25 Nov 2007 05:37:18 - 1.71
@@ -33,7 +33,6 @@
static void _mixer_mute_toggle (Mixer *mixer, Config_Item
*ci, int channel_id);
static Config_Item *_mixer_config_item_get (void *data, const char *id);
-static void _mixer_menu_cb_post (void *data, E_Menu *m);
static void _mixer_menu_cb_configure (void *data, E_Menu *m,
E_Menu_Item *mi);
static void _mixer_cb_mouse_down (void *data, Evas *e, Evas_Object
*obj, void *event_info);
static void _mixer_cb_mouse_wheel(void *data, Evas *e, Evas_Object
*obj, void *event_info);
@@ -255,7 +254,7 @@
if (!inst) return;
ev = event_info;
- if ((ev-button == 3) (!mixer_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
@@ -265,8 +264,6 @@
zone = e_util_zone_current_get(e_manager_current_get());
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _mixer_menu_cb_post, inst);
- mixer_config-menu = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_(Configuration));
@@ -317,14 +314,6 @@
}
static void
-_mixer_menu_cb_post(void *data, E_Menu *m)
-{
- if (!mixer_config-menu) return;
- e_object_del(E_OBJECT(mixer_config-menu));
- mixer_config-menu = NULL;
-}
-
-static void
_mixer_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance*inst;
@@ -555,13 +544,6 @@
if (mixer_config-config_dialog)
e_object_del(E_OBJECT(mixer_config-config_dialog));
-
- if (mixer_config-menu)
- {
- e_menu_post_deactivate_callback_set(mixer_config-menu, NULL, NULL);
- e_object_del(E_OBJECT(mixer_config-menu));
- mixer_config-menu = NULL;
- }
while (mixer_config-items)
{
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: mem devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : mem
Dir : e_modules/mem
Modified Files:
e_mod_main.h e_mod_main.c
Log Message:
Fix for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_main.h31 Oct 2007 14:09:38 - 1.14
+++ e_mod_main.h25 Nov 2007 05:37:36 - 1.15
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===
RCS file: /cvs/e/e_modules/mem/e_mod_main.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -3 -r1.48 -r1.49
--- e_mod_main.c12 Nov 2007 04:15:52 - 1.48
+++ e_mod_main.c25 Nov 2007 05:37:36 - 1.49
@@ -36,7 +36,6 @@
static void _mem_cb_mouse_out (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _mem_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_mem_config_item_get (const char *id);
static Mem *_mem_new (Evas * evas);
static void _mem_free (Mem * mem);
@@ -137,8 +136,7 @@
ecore_timer_del (inst-check_timer);
mem_config-instances = evas_list_remove (mem_config-instances, inst);
_mem_free (inst-mem);
- free (inst);
- inst = NULL;
+ E_FREE(inst);
}
static void
@@ -149,15 +147,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!mem_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _mem_menu_cb_post, inst);
- mem_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -173,22 +169,13 @@
e_util_zone_current_get (e_manager_current_get
()), x + ev-output.x,
y + ev-output.y, 1, 1,
-E_MENU_POP_DIRECTION_DOWN, ev-timestamp);
+E_MENU_POP_DIRECTION_AUTO, ev-timestamp);
evas_event_feed_mouse_up (inst-gcc-gadcon-evas, ev-button,
EVAS_BUTTON_NONE, ev-timestamp, NULL);
}
}
static void
-_mem_menu_cb_post (void *data, E_Menu * m)
-{
- if (!mem_config-menu)
-return;
- e_object_del (E_OBJECT (mem_config-menu));
- mem_config-menu = NULL;
-}
-
-static void
_mem_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -335,12 +322,6 @@
if (mem_config-config_dialog)
e_object_del (E_OBJECT (mem_config-config_dialog));
- if (mem_config-menu)
-{
- e_menu_post_deactivate_callback_set (mem_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (mem_config-menu));
- mem_config-menu = NULL;
-}
while (mem_config-items)
{
Config_Item *ci;
@@ -350,11 +331,9 @@
evas_list_remove_list (mem_config-items, mem_config-items);
if (ci-id)
evas_stringshare_del (ci-id);
- free (ci);
- ci = NULL;
+ E_FREE(ci);
}
- free (mem_config);
- mem_config = NULL;
+ E_FREE(mem_config);
E_CONFIG_DD_FREE (conf_item_edd);
E_CONFIG_DD_FREE (conf_edd);
return 1;
@@ -390,8 +369,7 @@
_mem_free (Mem * m)
{
evas_object_del (m-mem_obj);
- free (m);
- m = NULL;
+ E_FREE(m);
}
static void
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: moon devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : moon
Dir : e_modules/moon/src
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fix for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/moon/src/e_mod_main.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -3 -r1.14 -r1.15
--- e_mod_main.c12 Nov 2007 08:12:10 - 1.14
+++ e_mod_main.c25 Nov 2007 05:40:33 - 1.15
@@ -53,7 +53,6 @@
};
static void _button_cb_mouse_down(void *data, Evas *e, Evas_Object
*obj, void *event_info);
-static void _menu_cb_post(void *data, E_Menu *m);
static void _moon_inst_cb_menu_configure(void *data, E_Menu *m,
E_Menu_Item *mi);
static void _moon_timer_init();
@@ -234,15 +233,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!moon_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int cx, cy, cw, ch;
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _menu_cb_post, inst);
- moon_config-menu = mn;
mi = e_menu_item_new(mn); e_menu_item_label_set(mi,
D_(Configuration));
e_util_menu_item_edje_icon_set(mi, enlightenment/configuration);
@@ -261,20 +258,11 @@
}
static void
-_menu_cb_post(void *data, E_Menu *m)
-{
- if (!moon_config-menu) return;
- e_object_del(E_OBJECT(moon_config-menu));
- moon_config-menu = NULL;
-}
-
-static void
_moon_inst_cb_menu_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Evas_Object *o;
o = data;
- if (!moon_config-menu) return;
if (moon_config-config_dialog) return;
moon_config_dialog_show(o);
}
===
RCS file: /cvs/e/e_modules/moon/src/e_mod_main.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -3 -r1.4 -r1.5
--- e_mod_main.h2 Nov 2007 12:22:16 - 1.4
+++ e_mod_main.h25 Nov 2007 05:40:33 - 1.5
@@ -25,7 +25,6 @@
Evas_List *faces;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
};
EAPI extern E_Module_Api e_modapi;
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: net devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : net
Dir : e_modules/net/src
Modified Files:
e_mod_config.h e_mod_main.c e_mod_net.c
Log Message:
Fix for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/net/src/e_mod_config.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -3 -r1.7 -r1.8
--- e_mod_config.h 16 Sep 2007 01:48:35 - 1.7
+++ e_mod_config.h 25 Nov 2007 05:43:29 - 1.8
@@ -8,7 +8,6 @@
{
E_Module *mod;
E_Config_Dialog *cfd;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
===
RCS file: /cvs/e/e_modules/net/src/e_mod_main.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -3 -r1.10 -r1.11
--- e_mod_main.c12 Nov 2007 04:15:52 - 1.10
+++ e_mod_main.c25 Nov 2007 05:43:29 - 1.11
@@ -52,12 +52,6 @@
_gc_unregister();
if (cfg-cfd) e_object_del(E_OBJECT(cfg-cfd));
- if (cfg-menu)
- {
- e_menu_post_deactivate_callback_set(cfg-menu, NULL, NULL);
- e_object_del(E_OBJECT(cfg-menu));
- cfg-menu = NULL;
- }
while (cfg-items)
{
===
RCS file: /cvs/e/e_modules/net/src/e_mod_net.c,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -3 -r1.17 -r1.18
--- e_mod_net.c 16 Sep 2007 01:46:50 - 1.17
+++ e_mod_net.c 25 Nov 2007 05:43:29 - 1.18
@@ -14,7 +14,6 @@
#endif
static void _bytes_to_string(bytes_t bytes, char *string, int size);
-static void _cb_post(void *data, E_Menu *m);
static void _cb_configure(void *data, E_Menu *m, E_Menu_Item *mi);
#ifdef __FreeBSD__
@@ -152,17 +151,15 @@
if (x) ecore_exe_free(x);
}
}
- else if ((ev-button == 1) (!cfg-menu))
+ else if ((ev-button == 1) (!inst-gcc-menu))
e_gadcon_popup_toggle_pinned(inst-popup);
- else if ((ev-button == 3) (!cfg-menu))
+ else if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y;
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _cb_post, inst);
- cfg-menu = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_(Configuration));
@@ -237,15 +234,6 @@
snprintf(string, size, %lu KB, (bytes / 1024));
else
snprintf(string, size, %lu B, bytes);
-}
-
-static void
-_cb_post(void *data, E_Menu *m)
-{
- if (!cfg-menu) return;
- e_menu_post_deactivate_callback_set(cfg-menu, NULL, NULL);
- e_object_del(E_OBJECT(cfg-menu));
- cfg-menu = NULL;
}
static void
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: slideshow devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : slideshow
Dir : e_modules/slideshow
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fix for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/slideshow/e_mod_main.c,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -3 -r1.54 -r1.55
--- e_mod_main.c12 Nov 2007 04:15:52 - 1.54
+++ e_mod_main.c25 Nov 2007 05:48:33 - 1.55
@@ -37,7 +37,6 @@
static void _slide_cb_mouse_down (void *data, Evas *e, Evas_Object
*obj, void *event_info);
static void _slide_menu_cb_configure (void *data, E_Menu *m,
E_Menu_Item *mi);
-static void _slide_menu_cb_post (void *data, E_Menu *m);
static Config_Item *_slide_config_item_get (const char *id);
static Slideshow *_slide_new (Evas *evas);
static void _slide_free (Slideshow *ss);
@@ -170,15 +169,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!slide_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new();
- e_menu_post_deactivate_callback_set(mn, _slide_menu_cb_post, inst);
- slide_config-menu = mn;
mi = e_menu_item_new(mn);
e_menu_item_label_set(mi, D_(Configuration));
@@ -211,15 +208,6 @@
}
static void
-_slide_menu_cb_post(void *data, E_Menu *m)
-{
- if (!slide_config-menu)
- return;
- e_object_del(E_OBJECT(slide_config-menu));
- slide_config-menu = NULL;
-}
-
-static void
_slide_menu_cb_configure(void *data, E_Menu *m, E_Menu_Item *mi)
{
Instance *inst;
@@ -357,12 +345,6 @@
if (slide_config-config_dialog)
e_object_del(E_OBJECT(slide_config-config_dialog));
- if (slide_config-menu)
- {
- e_menu_post_deactivate_callback_set(slide_config-menu, NULL, NULL);
- e_object_del(E_OBJECT(slide_config-menu));
- slide_config-menu = NULL;
- }
while (slide_config-items)
{
Config_Item *ci;
===
RCS file: /cvs/e/e_modules/slideshow/e_mod_main.h,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -3 -r1.21 -r1.22
--- e_mod_main.h31 Oct 2007 14:30:58 - 1.21
+++ e_mod_main.h25 Nov 2007 05:48:33 - 1.22
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: uptime devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : uptime
Dir : e_modules/uptime
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fixes for recent gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/uptime/e_mod_main.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -3 -r1.27 -r1.28
--- e_mod_main.c12 Nov 2007 04:15:53 - 1.27
+++ e_mod_main.c25 Nov 2007 05:50:41 - 1.28
@@ -64,7 +64,6 @@
static void _ut_cb_mouse_down (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _ut_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _ut_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_ut_config_item_get (const char *id);
static Uptime *_ut_new (Evas * evas);
static void _ut_free (Uptime * ut);
@@ -191,21 +190,16 @@
Instance *inst;
Evas_Event_Mouse_Down *ev;
- if (ut_config-menu != NULL)
-return;
-
inst = data;
ev = event_info;
- if (ev-button == 3)
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _ut_menu_cb_post, inst);
- ut_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -228,15 +222,6 @@
}
static void
-_ut_menu_cb_post (void *data, E_Menu * m)
-{
- if (ut_config-menu == NULL)
-return;
- e_object_del (E_OBJECT (ut_config-menu));
- ut_config-menu = NULL;
-}
-
-static void
_ut_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -367,12 +352,6 @@
if (ut_config-config_dialog != NULL)
e_object_del (E_OBJECT (ut_config-config_dialog));
- if (ut_config-menu)
-{
- e_menu_post_deactivate_callback_set (ut_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (ut_config-menu));
- ut_config-menu = NULL;
-}
while (ut_config-items)
{
Config_Item *ci;
===
RCS file: /cvs/e/e_modules/uptime/e_mod_main.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -3 -r1.9 -r1.10
--- e_mod_main.h31 Oct 2007 14:44:31 - 1.9
+++ e_mod_main.h25 Nov 2007 05:50:41 - 1.10
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: weather devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : weather
Dir : e_modules/weather
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fixes for recent gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.c,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -3 -r1.60 -r1.61
--- e_mod_main.c12 Nov 2007 04:15:53 - 1.60
+++ e_mod_main.c25 Nov 2007 05:52:45 - 1.61
@@ -64,7 +64,6 @@
void *event_info);
static void _weather_menu_cb_configure (void *data, E_Menu * m,
E_Menu_Item * mi);
-static void _weather_menu_cb_post (void *data, E_Menu * m);
static int _weather_cb_check (void *data);
static Config_Item *_weather_config_item_get (const char *id);
static Weather *_weather_new (Evas * evas);
@@ -208,15 +207,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!weather_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _weather_menu_cb_post, inst);
- weather_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -239,15 +236,6 @@
}
static void
-_weather_menu_cb_post (void *data, E_Menu * m)
-{
- if (!weather_config-menu)
-return;
- e_object_del (E_OBJECT (weather_config-menu));
- weather_config-menu = NULL;
-}
-
-static void
_weather_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -368,12 +356,6 @@
if (weather_config-config_dialog)
e_object_del (E_OBJECT (weather_config-config_dialog));
- if (weather_config-menu)
-{
- e_menu_post_deactivate_callback_set (weather_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (weather_config-menu));
- weather_config-menu = NULL;
-}
while (weather_config-items)
{
===
RCS file: /cvs/e/e_modules/weather/e_mod_main.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -3 -r1.22 -r1.23
--- e_mod_main.h31 Oct 2007 14:48:47 - 1.22
+++ e_mod_main.h25 Nov 2007 05:52:45 - 1.23
@@ -17,7 +17,6 @@
E_Config_Dialog *config_dialog;
Evas_List *instances;
Evas_List *items;
- E_Menu *menu;
};
struct _Config_Item
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
E CVS: wlan devilhorns
Enlightenment CVS committal
Author : devilhorns
Project : e_modules
Module : wlan
Dir : e_modules/wlan
Modified Files:
e_mod_main.c e_mod_main.h
Log Message:
Fix for gadcon menu breakage.
===
RCS file: /cvs/e/e_modules/wlan/e_mod_main.c,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -3 -r1.42 -r1.43
--- e_mod_main.c12 Nov 2007 04:15:53 - 1.42
+++ e_mod_main.c25 Nov 2007 05:58:43 - 1.43
@@ -36,7 +36,6 @@
static void _wlan_cb_mouse_out (void *data, Evas * e, Evas_Object * obj,
void *event_info);
static void _wlan_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi);
-static void _wlan_menu_cb_post (void *data, E_Menu * m);
static Config_Item *_wlan_config_item_get (const char *id);
static Wlan *_wlan_new (Evas * evas);
static void _wlan_free (Wlan * wlan);
@@ -151,15 +150,13 @@
inst = data;
ev = event_info;
- if ((ev-button == 3) (!wlan_config-menu))
+ if ((ev-button == 3) (!inst-gcc-menu))
{
E_Menu *mn;
E_Menu_Item *mi;
int x, y, w, h;
mn = e_menu_new ();
- e_menu_post_deactivate_callback_set (mn, _wlan_menu_cb_post, inst);
- wlan_config-menu = mn;
mi = e_menu_item_new (mn);
e_menu_item_label_set (mi, D_ (Configuration));
@@ -182,15 +179,6 @@
}
static void
-_wlan_menu_cb_post (void *data, E_Menu * m)
-{
- if (!wlan_config-menu)
-return;
- e_object_del (E_OBJECT (wlan_config-menu));
- wlan_config-menu = NULL;
-}
-
-static void
_wlan_menu_cb_configure (void *data, E_Menu * m, E_Menu_Item * mi)
{
Instance *inst;
@@ -332,12 +320,6 @@
if (wlan_config-config_dialog)
e_object_del (E_OBJECT (wlan_config-config_dialog));
- if (wlan_config-menu)
-{
- e_menu_post_deactivate_callback_set (wlan_config-menu, NULL, NULL);
- e_object_del (E_OBJECT (wlan_config-menu));
- wlan_config-menu = NULL;
-}
while (wlan_config-items)
{
Config_Item *ci;
===
RCS file: /cvs/e/e_modules/wlan/e_mod_main.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -3 -r1.13 -r1.14
--- e_mod_main.h31 Oct 2007 14:52:46 - 1.13
+++ e_mod_main.h25 Nov 2007 05:58:43 - 1.14
@@ -10,7 +10,6 @@
{
E_Module *module;
E_Config_Dialog *config_dialog;
- E_Menu *menu;
Evas_List *instances;
Evas_List *items;
};
-
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse012070mrt/direct/01/
___
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
