projects
/
platform
/
upstream
/
elementary.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
43af77a
)
X11 calls should be conditional
author
xcomputerman
<xcomputerman>
Wed, 13 Jan 2010 08:37:56 +0000
(08:37 +0000)
committer
xcomputerman
<xcomputerman@7cbeb6ba-43b4-40fd-8cce-4c39aea84d33>
Wed, 13 Jan 2010 08:37:56 +0000
(08:37 +0000)
SVN revision: 45082
src/lib/elm_conform.c
patch
|
blob
|
history
diff --git
a/src/lib/elm_conform.c
b/src/lib/elm_conform.c
index
69aa908
..
9103a03
100644
(file)
--- a/
src/lib/elm_conform.c
+++ b/
src/lib/elm_conform.c
@@
-65,6
+65,7
@@
elm_conformant_add(Evas_Object *parent)
_elm_theme_set(wd->base, "conformant", "base", "default");
elm_widget_resize_object_set(obj, wd->base);
+#ifdef HAVE_ELEMENTARY_X
ecore_x_e_illume_top_shelf_geometry_get(ecore_x_window_root_first_get(),
NULL, NULL, NULL, &sh);
if (sh < 0) sh = 32;
@@
-74,6
+75,7
@@
elm_conformant_add(Evas_Object *parent)
evas_object_size_hint_min_set(wd->shelf, -1, sh);
evas_object_size_hint_max_set(wd->shelf, -1, sh);
edje_object_part_swallow(wd->base, "elm.swallow.shelf", wd->shelf);
+#endif
_sizing_eval(obj);
return obj;