kikadf
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

1. autofoot patches. 

2. fix maximize to work again. :)


SVN revision: 23375
This commit is contained in:
Carsten Haitzler 2006-06-11 10:23:49 +00:00
parent a41f512fea
commit f8c6092553
4 changed files with 9 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.in
View File

@ -128,17 +128,12 @@ else
fi fi
dnl Set PACKAGE_DATA_DIR in config.h. dnl Set PACKAGE_DATA_DIR in config.h.
if test "x${datadir}" = 'x${prefix}/share'; then if test "x${prefix}" = "xNONE"; then
if test "x${prefix}" = "xNONE"; then
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", "Package installed data destination") AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${ac_default_prefix}/share/${PACKAGE}", "Package installed data destination")
AC_DEFINE_UNQUOTED(LOCALE_DIR, "${ac_default_prefix}/share/locale", "Locale directory") AC_DEFINE_UNQUOTED(LOCALE_DIR, "${ac_default_prefix}/share/locale", "Locale directory")
else else
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination") AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", "Package installed data destination")
AC_DEFINE_UNQUOTED(LOCALE_DIR, "${prefix}/share/locale", "Locale directory") AC_DEFINE_UNQUOTED(LOCALE_DIR, "${prefix}/share/locale", "Locale directory")
fi
else
AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${datadir}/${PACKAGE}", "Package installed data destination")
AC_DEFINE_UNQUOTED(LOCALE_DIR, "${datadir}/locale", "Locale directory")
fi fi
x_dir="" x_dir=""

4
enlightenment-config.in
View File

@ -39,7 +39,7 @@ while test $# -gt 0; do
echo @VERSION@ echo @VERSION@
;; ;;
--cflags) --cflags)
includes="-I@includedir@ -I@includedir@/enlightenment" includes="-I@prefix@/include -I@prefix@/include/enlightenment"
echo $includes @e_cflags@ echo $includes @e_cflags@
;; ;;
--libs) --libs)
@ -51,7 +51,7 @@ while test $# -gt 0; do
echo $dir echo $dir
;; ;;
--config-apps-dir) --config-apps-dir)
dir="@datadir@/@PACKAGE@/config-apps" dir="@prefix@/share/@PACKAGE@/config-apps"
echo $dir echo $dir
;; ;;
*) *)

6
src/bin/e_border.c
View File

@ -1536,11 +1536,7 @@ e_border_maximize(E_Border *bd, E_Maximize max)
E_OBJECT_CHECK(bd); E_OBJECT_CHECK(bd);
E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE); E_OBJECT_TYPE_CHECK(bd, E_BORDER_TYPE);
if (!(max & E_MAXIMIZE_DIRECTION)) if (!(max & E_MAXIMIZE_DIRECTION)) max |= E_MAXIMIZE_BOTH;
{
printf("BUG: Maximize call without direction!\n");
return;
}
if ((bd->shaded) || (bd->shading)) return; if ((bd->shaded) || (bd->shading)) return;
if (bd->fullscreen) if (bd->fullscreen)

4
src/bin/e_maximize.c
View File

@ -25,6 +25,7 @@ static void _e_maximize_border_rects_fill(E_Border *bd, Evas_List *list, int *x1
EAPI void EAPI void
e_maximize_border_gadman_fit(E_Border *bd, int *x1, int *y1, int *x2, int *y2) e_maximize_border_gadman_fit(E_Border *bd, int *x1, int *y1, int *x2, int *y2)
{ {
printf("e_maximize_border_gadman_fit()\n");
return e_maximize_border_gadman_fill(bd, x1, y1, x2, y2); return e_maximize_border_gadman_fill(bd, x1, y1, x2, y2);
} }
@ -35,6 +36,7 @@ e_maximize_border_dock_fit(E_Border *bd, int *x1, int *y1, int *x2, int *y2)
E_Border *bd2; E_Border *bd2;
int cx1, cx2, cy1, cy2; int cx1, cx2, cy1, cy2;
printf("e_maximize_border_dock_fit()\n");
cx1 = bd->zone->x; cx1 = bd->zone->x;
if (x1) cx1 = *x1; if (x1) cx1 = *x1;
@ -126,6 +128,7 @@ e_maximize_border_gadman_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2)
Evas_List *l, *rects = NULL; Evas_List *l, *rects = NULL;
E_Maximize_Rect *r; E_Maximize_Rect *r;
printf("e_maximize_border_gadman_fill()\n");
for (l = bd->zone->container->gadman->clients; l; l = l->next) for (l = bd->zone->container->gadman->clients; l; l = l->next)
{ {
E_Gadman_Client *gmc; E_Gadman_Client *gmc;
@ -159,6 +162,7 @@ e_maximize_border_border_fill(E_Border *bd, int *x1, int *y1, int *x2, int *y2)
E_Maximize_Rect *r; E_Maximize_Rect *r;
E_Border *bd2; E_Border *bd2;
printf("e_maximize_border_border_fill()\n");
bl = e_container_border_list_first(bd->zone->container); bl = e_container_border_list_first(bd->zone->container);
while ((bd2 = e_container_border_list_next(bl))) while ((bd2 = e_container_border_list_next(bl)))
{ {