summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Michael <cpmichael1@comcast.net>2009-11-25 01:02:11 +0000
committerChristopher Michael <cpmichael1@comcast.net>2009-11-25 01:02:11 +0000
commitfc8c5cac0dd8b1a38fef981e9f7e40d51a47963c (patch)
tree0733bcd7e81549f5d11188ded9f6aae18c93d71a
parent2945763e97061b5cc1a35a72432ce999059df6b0 (diff)
Add illume-indicator module to configure.ac
Some formatting in e_gadcon/e_shelf. SVN revision: 43966
-rw-r--r--configure.ac2
-rw-r--r--src/bin/e_gadcon.c3
-rw-r--r--src/bin/e_shelf.c2
3 files changed, 5 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index fbc3a6c..7b6563a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -615,6 +615,8 @@ src/modules/illume-keyboard/Makefile
615src/modules/illume-keyboard/module.desktop 615src/modules/illume-keyboard/module.desktop
616src/modules/illume-keyboard/keyboards/Makefile 616src/modules/illume-keyboard/keyboards/Makefile
617src/modules/illume-keyboard/dicts/Makefile 617src/modules/illume-keyboard/dicts/Makefile
618src/modules/illume-indicator/Makefile
619src/modules/illume-indicator/module.desktop
618src/modules/syscon/Makefile 620src/modules/syscon/Makefile
619src/modules/syscon/module.desktop 621src/modules/syscon/module.desktop
620src/modules/everything/Makefile 622src/modules/everything/Makefile
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index f06797a..f032f2f 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -911,7 +911,8 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
911 evas_object_geometry_get(gcc->o_frame, &x, &y, &w, &h); 911 evas_object_geometry_get(gcc->o_frame, &x, &y, &w, &h);
912 else if (gcc->o_base) 912 else if (gcc->o_base)
913 evas_object_geometry_get(gcc->o_base, &x, &y, &w, &h); 913 evas_object_geometry_get(gcc->o_base, &x, &y, &w, &h);
914 else return; /* make clang happy */ 914// FIXME
915// else return; /* make clang happy */
915 evas_object_move(gcc->o_control, x, y); 916 evas_object_move(gcc->o_control, x, y);
916 evas_object_resize(gcc->o_control, w, h); 917 evas_object_resize(gcc->o_control, w, h);
917 e_theme_edje_object_set(gcc->o_control, "base/theme/gadman", 918 e_theme_edje_object_set(gcc->o_control, "base/theme/gadman",
diff --git a/src/bin/e_shelf.c b/src/bin/e_shelf.c
index c6f669a..bd049f8 100644
--- a/src/bin/e_shelf.c
+++ b/src/bin/e_shelf.c
@@ -165,7 +165,7 @@ e_shelf_zone_new(E_Zone *zone, const char *name, const char *style, int popup, i
165 locname = es->name; 165 locname = es->name;
166 if (!name) locname = _("Shelf #"); 166 if (!name) locname = _("Shelf #");
167 snprintf(buf, sizeof(buf), "%s %i", locname, es->id); 167 snprintf(buf, sizeof(buf), "%s %i", locname, es->id);
168 es->gadcon->location = e_gadcon_location_new (buf, E_GADCON_SITE_SHELF, _e_shelf_gadcon_client_add, es, _e_shelf_gadcon_client_remove, es); 168 es->gadcon->location = e_gadcon_location_new(buf, E_GADCON_SITE_SHELF, _e_shelf_gadcon_client_add, es, _e_shelf_gadcon_client_remove, es);
169 e_gadcon_location_register(es->gadcon->location); 169 e_gadcon_location_register(es->gadcon->location);
170// hmm dnd in ibar and ibox kill this. ok. need to look into this more 170// hmm dnd in ibar and ibox kill this. ok. need to look into this more
171// es->gadcon->instant_edit = 1; 171// es->gadcon->instant_edit = 1;