Hi All,
At it again :) Here's a diff for e_gadman that fixes the
* BUG: if you alt-click on a module to move it
issue. Basically I created a new func e_gadman_client_mode_set to be
called by modules in place of e_gadman_mode_set, which will set edit
mode just for that module.
I've enclosed a diff for ibar (against current dev cvs) which
implements this. It's been tested here quite a bit. Please run it
through the paces and commit if it looks good. If this goes in, I'll
change all the other modules to use it.
Cheers,
devilhorns
--- e_gadman.c.orig 2005-12-13 06:44:56.000000000 -0500
+++ e_gadman.c 2005-12-13 06:55:48.000000000 -0500
@@ -13,20 +13,26 @@
struct _Gadman_Client_Config
{
- struct {
+ struct
+ {
int x, y, w, h;
- } pos;
- struct {
+ }
+ pos;
+ struct
+ {
int l, r, t, b;
- } pad;
+ }
+ pad;
int w, h;
int edge;
int zone;
int use_autow, use_autoh;
- struct {
+ struct
+ {
int w, h;
Evas_List *others;
- } res;
+ }
+ res;
};
static void _e_gadman_free(E_Gadman *gm);
@@ -83,7 +89,7 @@
/* externally accessible functions */
int
-e_gadman_init(void)
+ e_gadman_init(void)
{
gadman_config_edd = E_CONFIG_DD_NEW("Gadman_Client_Config", Gadman_Client_Config);
#undef T
@@ -111,7 +117,7 @@
}
int
-e_gadman_shutdown(void)
+ e_gadman_shutdown(void)
{
E_CONFIG_DD_FREE(gadman_config_edd);
gadman_config_edd = NULL;
@@ -119,7 +125,7 @@
}
E_Gadman *
-e_gadman_new(E_Container *con)
+ e_gadman_new(E_Container *con)
{
E_Gadman *gm;
@@ -130,7 +136,7 @@
}
void
-e_gadman_mode_set(E_Gadman *gm, E_Gadman_Mode mode)
+ e_gadman_mode_set(E_Gadman *gm, E_Gadman_Mode mode)
{
Evas_List *l;
@@ -161,7 +167,7 @@
}
E_Gadman_Mode
-e_gadman_mode_get(E_Gadman *gm)
+ e_gadman_mode_get(E_Gadman *gm)
{
E_OBJECT_CHECK_RETURN(gm, E_GADMAN_MODE_NORMAL);
E_OBJECT_TYPE_CHECK_RETURN(gm, E_GADMAN_TYPE, E_GADMAN_MODE_NORMAL);
@@ -169,7 +175,32 @@
}
void
-e_gadman_all_save(E_Gadman *gm)
+ e_gadman_client_mode_set(E_Gadman_Client *gmc, E_Gadman_Mode mode)
+{
+ E_OBJECT_CHECK(gmc);
+ E_OBJECT_TYPE_CHECK(gm, E_GADMAN_CLIENT_TYPE);
+ if (gmc->gadman->mode == mode) return;
+ gmc->gadman->mode = mode;
+ if (gmc->gadman->mode == E_GADMAN_MODE_EDIT)
+ {
+ _e_gadman_client_edit_begin(gmc);
+ }
+ else if (gmc->gadman->mode == E_GADMAN_MODE_NORMAL)
+ {
+ _e_gadman_client_edit_end(gmc);
+ }
+}
+
+E_Gadman_Mode
+e_gadman_client_mode_get(E_Gadman_Client *gmc)
+{
+ E_OBJECT_CHECK_RETURN(gmc->gadman, E_GADMAN_MODE_NORMAL);
+ E_OBJECT_TYPE_CHECK_RETURN(gmc->gadman, E_GADMAN_TYPE, E_GADMAN_MODE_NORMAL);
+ return gmc->gadman->mode;
+}
+
+void
+ e_gadman_all_save(E_Gadman *gm)
{
Evas_List *l;
@@ -184,7 +215,7 @@
}
void
-e_gadman_container_resize(E_Gadman *gm)
+ e_gadman_container_resize(E_Gadman *gm)
{
Evas_List *l;
@@ -199,7 +230,7 @@
}
E_Gadman_Client *
-e_gadman_client_new(E_Gadman *gm)
+ e_gadman_client_new(E_Gadman *gm)
{
E_Gadman_Client *gmc;
E_OBJECT_CHECK_RETURN(gm, NULL);
@@ -224,7 +255,7 @@
}
void
-e_gadman_client_save(E_Gadman_Client *gmc)
+ e_gadman_client_save(E_Gadman_Client *gmc)
{
Gadman_Client_Config *cf, *cf2;
Evas_List *l;
@@ -266,7 +297,7 @@
}
void
-e_gadman_client_load(E_Gadman_Client *gmc)
+ e_gadman_client_load(E_Gadman_Client *gmc)
{
Gadman_Client_Config *cf, *cf2;
Evas_List *l;
@@ -342,8 +373,8 @@
}
if (gmc->w > gmc->zone->w) gmc->w = gmc->zone->w;
if (gmc->h > gmc->zone->h) gmc->h = gmc->zone->h;
-// gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax);
-// gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay);
+ // gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax);
+ // gmc->y = gmc->zone->y + ((gmc->zone->h - gmc->h) * gmc->ay);
if (cf->pos.w != cf->w)
gmc->x = gmc->zone->x + ((gmc->zone->w - gmc->w) * gmc->ax);
else
@@ -375,7 +406,7 @@
}
void
-e_gadman_client_domain_set(E_Gadman_Client *gmc, char *domain, int instance)
+ e_gadman_client_domain_set(E_Gadman_Client *gmc, char *domain, int instance)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -385,7 +416,7 @@
}
void
-e_gadman_client_zone_set(E_Gadman_Client *gmc, E_Zone *zone)
+ e_gadman_client_zone_set(E_Gadman_Client *gmc, E_Zone *zone)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -402,7 +433,7 @@
}
void
-e_gadman_client_policy_set(E_Gadman_Client *gmc, E_Gadman_Policy pol)
+ e_gadman_client_policy_set(E_Gadman_Client *gmc, E_Gadman_Policy pol)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -427,7 +458,7 @@
}
void
-e_gadman_client_min_size_set(E_Gadman_Client *gmc, Evas_Coord minw, Evas_Coord minh)
+ e_gadman_client_min_size_set(E_Gadman_Client *gmc, Evas_Coord minw, Evas_Coord minh)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -448,7 +479,7 @@
}
void
-e_gadman_client_max_size_set(E_Gadman_Client *gmc, Evas_Coord maxw, Evas_Coord maxh)
+ e_gadman_client_max_size_set(E_Gadman_Client *gmc, Evas_Coord maxw, Evas_Coord maxh)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -469,7 +500,7 @@
}
void
-e_gadman_client_align_set(E_Gadman_Client *gmc, double xalign, double yalign)
+ e_gadman_client_align_set(E_Gadman_Client *gmc, double xalign, double yalign)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -482,7 +513,7 @@
}
void
-e_gadman_client_aspect_set(E_Gadman_Client *gmc, double mina, double maxa)
+ e_gadman_client_aspect_set(E_Gadman_Client *gmc, double mina, double maxa)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -491,7 +522,7 @@
}
void
-e_gadman_client_padding_set(E_Gadman_Client *gmc, int l, int r, int t, int b)
+ e_gadman_client_padding_set(E_Gadman_Client *gmc, int l, int r, int t, int b)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -502,7 +533,7 @@
}
void
-e_gadman_client_auto_size_set(E_Gadman_Client *gmc, Evas_Coord autow, Evas_Coord autoh)
+ e_gadman_client_auto_size_set(E_Gadman_Client *gmc, Evas_Coord autow, Evas_Coord autoh)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -522,7 +553,7 @@
}
void
-e_gadman_client_edge_set(E_Gadman_Client *gmc, E_Gadman_Edge edge)
+ e_gadman_client_edge_set(E_Gadman_Client *gmc, E_Gadman_Edge edge)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -530,7 +561,7 @@
}
E_Gadman_Edge
-e_gadman_client_edge_get(E_Gadman_Client *gmc)
+ e_gadman_client_edge_get(E_Gadman_Client *gmc)
{
E_OBJECT_CHECK_RETURN(gmc, E_GADMAN_EDGE_TOP);
E_OBJECT_TYPE_CHECK_RETURN(gmc, E_GADMAN_CLIENT_TYPE, E_GADMAN_EDGE_TOP);
@@ -538,7 +569,7 @@
}
void
-e_gadman_client_geometry_get(E_Gadman_Client *gmc, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
+ e_gadman_client_geometry_get(E_Gadman_Client *gmc, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -549,7 +580,7 @@
}
void
-e_gadman_client_user_resize(E_Gadman_Client *gmc, Evas_Coord w, Evas_Coord h)
+ e_gadman_client_user_resize(E_Gadman_Client *gmc, Evas_Coord w, Evas_Coord h)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -566,7 +597,7 @@
}
void
-e_gadman_client_resize(E_Gadman_Client *gmc, Evas_Coord w, Evas_Coord h)
+ e_gadman_client_resize(E_Gadman_Client *gmc, Evas_Coord w, Evas_Coord h)
{
int re_adjust = 0;
@@ -594,7 +625,7 @@
}
void
-e_gadman_client_change_func_set(E_Gadman_Client *gmc, void (*func) (void *data, E_Gadman_Client *gmc, E_Gadman_Change change), void *data)
+ e_gadman_client_change_func_set(E_Gadman_Client *gmc, void (*func) (void *data, E_Gadman_Client *gmc, E_Gadman_Change change), void *data)
{
E_OBJECT_CHECK(gmc);
E_OBJECT_TYPE_CHECK(gmc, E_GADMAN_CLIENT_TYPE);
@@ -603,7 +634,7 @@
}
E_Menu *
-e_gadman_client_menu_new(E_Gadman_Client *gmc)
+ e_gadman_client_menu_new(E_Gadman_Client *gmc)
{
E_Menu *m;
E_Menu_Item *mi;
@@ -719,13 +750,13 @@
/* local subsystem functions */
static void
-_e_gadman_free(E_Gadman *gm)
+ _e_gadman_free(E_Gadman *gm)
{
free(gm);
}
static void
-_e_gadman_client_free(E_Gadman_Client *gmc)
+ _e_gadman_client_free(E_Gadman_Client *gmc)
{
if (gmc->menu) e_object_del(E_OBJECT(gmc->menu));
if (gmc->control_object) evas_object_del(gmc->control_object);
@@ -737,7 +768,7 @@
}
static void
-_e_gadman_client_edit_begin(E_Gadman_Client *gmc)
+ _e_gadman_client_edit_begin(E_Gadman_Client *gmc)
{
gmc->control_object = edje_object_add(gmc->gadman->container->bg_evas);
evas_object_layer_set(gmc->control_object, 100);
@@ -806,7 +837,7 @@
}
static void
-_e_gadman_client_edit_end(E_Gadman_Client *gmc)
+ _e_gadman_client_edit_end(E_Gadman_Client *gmc)
{
e_gadman_client_save(gmc);
if (gmc->moving) e_move_end();
@@ -825,7 +856,7 @@
}
static void
-_e_gadman_client_overlap_deny(E_Gadman_Client *gmc)
+ _e_gadman_client_overlap_deny(E_Gadman_Client *gmc)
{
Evas_List *l;
Evas_Coord ox, oy;
@@ -1057,7 +1088,7 @@
}
static void
-_e_gadman_client_down_store(E_Gadman_Client *gmc)
+ _e_gadman_client_down_store(E_Gadman_Client *gmc)
{
gmc->down_store_x = gmc->x;
gmc->down_store_y = gmc->y;
@@ -1067,7 +1098,7 @@
}
static int
-_e_gadman_client_is_being_modified(E_Gadman_Client *gmc)
+ _e_gadman_client_is_being_modified(E_Gadman_Client *gmc)
{
if ((gmc->moving) ||
(gmc->resizing_l) || (gmc->resizing_r) ||
@@ -1077,7 +1108,7 @@
}
static void
-_e_gadman_client_geometry_to_align(E_Gadman_Client *gmc)
+ _e_gadman_client_geometry_to_align(E_Gadman_Client *gmc)
{
if (gmc->w != gmc->zone->w)
gmc->ax = (double)(gmc->x - gmc->zone->x) / (double)(gmc->zone->w - gmc->w);
@@ -1090,7 +1121,7 @@
}
static void
-_e_gadman_client_aspect_enforce(E_Gadman_Client *gmc, double cx, double cy, int use_horiz)
+ _e_gadman_client_aspect_enforce(E_Gadman_Client *gmc, double cx, double cy, int use_horiz)
{
Evas_Coord neww, newh;
double aspect;
@@ -1131,7 +1162,7 @@
}
static void
-_e_gadman_client_geometry_apply(E_Gadman_Client *gmc)
+ _e_gadman_client_geometry_apply(E_Gadman_Client *gmc)
{
if (gmc->event_object)
{
@@ -1146,13 +1177,13 @@
}
static void
-_e_gadman_client_callback_call(E_Gadman_Client *gmc, E_Gadman_Change change)
+ _e_gadman_client_callback_call(E_Gadman_Client *gmc, E_Gadman_Change change)
{
if (gmc->func) gmc->func(gmc->data, gmc, change);
}
static void
-_e_gadman_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+ _e_gadman_cb_mouse_down(void *data, Evas *evas, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Down *ev;
E_Gadman_Client *gmc;
@@ -1178,7 +1209,7 @@
}
static void
-_e_gadman_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+ _e_gadman_cb_mouse_up(void *data, Evas *evas, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Up *ev;
E_Gadman_Client *gmc;
@@ -1189,7 +1220,7 @@
}
static void
-_e_gadman_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+ _e_gadman_cb_mouse_in(void *data, Evas *evas, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_In *ev;
E_Gadman_Client *gmc;
@@ -1201,7 +1232,7 @@
}
static void
-_e_gadman_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info)
+ _e_gadman_cb_mouse_out(void *data, Evas *evas, Evas_Object *obj, void *event_info)
{
Evas_Event_Mouse_Out *ev;
E_Gadman_Client *gmc;
@@ -1213,7 +1244,7 @@
}
static void
-_e_gadman_cb_signal_move_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_move_start(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1233,7 +1264,7 @@
}
static void
-_e_gadman_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_move_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1246,7 +1277,7 @@
}
static void
-_e_gadman_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_move_go(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
Evas_Coord x, y;
@@ -1255,7 +1286,6 @@
int new_zone = 0;
Evas_List *skiplist = NULL;
-
gmc = data;
if (!gmc->moving) return;
evas_pointer_canvas_xy_get(gmc->gadman->container->bg_evas, &x, &y);
@@ -1411,7 +1441,7 @@
}
static void
-_e_gadman_cb_signal_resize_left_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_left_start(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1429,7 +1459,7 @@
}
static void
-_e_gadman_cb_signal_resize_left_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_left_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1441,7 +1471,7 @@
}
static void
-_e_gadman_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_left_go(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
Evas_Coord x, y;
@@ -1502,7 +1532,7 @@
}
static void
-_e_gadman_cb_signal_resize_right_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_right_start(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1520,7 +1550,7 @@
}
static void
-_e_gadman_cb_signal_resize_right_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_right_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1532,7 +1562,7 @@
}
static void
-_e_gadman_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_right_go(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
Evas_Coord x, y;
@@ -1589,7 +1619,7 @@
}
static void
-_e_gadman_cb_signal_resize_up_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_up_start(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1607,7 +1637,7 @@
}
static void
-_e_gadman_cb_signal_resize_up_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_up_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1619,7 +1649,7 @@
}
static void
-_e_gadman_cb_signal_resize_up_go(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_up_go(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
Evas_Coord x, y;
@@ -1680,7 +1710,7 @@
}
static void
-_e_gadman_cb_signal_resize_down_start(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_down_start(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1698,7 +1728,7 @@
}
static void
-_e_gadman_cb_signal_resize_down_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_down_stop(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
@@ -1710,7 +1740,7 @@
}
static void
-_e_gadman_cb_signal_resize_down_go(void *data, Evas_Object *obj, const char *emission, const char *source)
+ _e_gadman_cb_signal_resize_down_go(void *data, Evas_Object *obj, const char *emission, const char *source)
{
E_Gadman_Client *gmc;
Evas_Coord x, y;
@@ -1767,7 +1797,7 @@
}
static void
-_e_gadman_cb_menu_end(void *data, E_Menu *m)
+ _e_gadman_cb_menu_end(void *data, E_Menu *m)
{
E_Gadman_Client *gmc;
@@ -1777,7 +1807,7 @@
}
static void
-_e_gadman_cb_half_width(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_half_width(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1805,7 +1835,7 @@
}
static void
-_e_gadman_cb_full_width(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_full_width(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1834,7 +1864,7 @@
}
static void
-_e_gadman_cb_auto_width(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_auto_width(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1857,7 +1887,7 @@
}
static void
-_e_gadman_cb_center_horiz(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_center_horiz(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1870,7 +1900,7 @@
}
static void
-_e_gadman_cb_half_height(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_half_height(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1898,7 +1928,7 @@
}
static void
-_e_gadman_cb_full_height(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_full_height(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1927,7 +1957,7 @@
}
static void
-_e_gadman_cb_auto_height(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_auto_height(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1949,9 +1979,8 @@
_e_gadman_client_callback_call(gmc, E_GADMAN_CHANGE_MOVE_RESIZE);
}
-
static void
-_e_gadman_cb_center_vert(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_center_vert(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1964,7 +1993,7 @@
}
static void
-_e_gadman_cb_end_edit_mode(void *data, E_Menu *m, E_Menu_Item *mi)
+ _e_gadman_cb_end_edit_mode(void *data, E_Menu *m, E_Menu_Item *mi)
{
E_Gadman_Client *gmc;
@@ -1973,7 +2002,7 @@
}
static void
-_e_gadman_config_free(Gadman_Client_Config *cf)
+ _e_gadman_config_free(Gadman_Client_Config *cf)
{
while (cf->res.others)
{
@@ -1984,7 +2013,7 @@
}
static void
-_e_gadman_client_geom_store(E_Gadman_Client *gmc)
+ _e_gadman_client_geom_store(E_Gadman_Client *gmc)
{
Gadman_Client_Config *cf;
--- e_gadman.h.orig 2005-12-13 06:44:40.000000000 -0500
+++ e_gadman.h 2005-12-13 07:07:33.000000000 -0500
@@ -119,5 +119,8 @@
EAPI void e_gadman_client_change_func_set(E_Gadman_Client *gmc, void (*func) (void *data, E_Gadman_Client *gmc, E_Gadman_Change change), void *data);
EAPI E_Menu *e_gadman_client_menu_new(E_Gadman_Client *gmc);
+EAPI void e_gadman_client_mode_set(E_Gadman_Client *gmc, E_Gadman_Mode mode);
+EAPI E_Gadman_Mode e_gadman_client_mode_get(E_Gadman_Client *gmc);
+
#endif
#endif
--- e_mod_main.c.orig 2005-12-13 05:09:55.000000000 -0500
+++ e_mod_main.c 2005-12-13 07:13:43.000000000 -0500
@@ -1815,7 +1810,7 @@
IBar_Bar *ibb;
ibb = data;
- e_gadman_mode_set(ibb->gmc->gadman, E_GADMAN_MODE_EDIT);
+ e_gadman_client_mode_set(ibb->gmc, E_GADMAN_MODE_EDIT);
}
static void
