diff options
author | KEvin Vandersloot <kfv101@psu.edu> | 2003-05-13 00:48:46 +0000 |
---|---|---|
committer | Kevin Vandersloot <kevinv@src.gnome.org> | 2003-05-13 00:48:46 +0000 |
commit | 4d04f5c83ff087570bab3573fbec2cf8869e8fde (patch) | |
tree | dca960014e06500fbfc4103a98036bc2088d96de | |
parent | 362b21d16b17f1c85d23b54228aa8c63652b736f (diff) |
only build battstat on supported platforms. Patch by Christian Marillat.
2003-05-12 KEvin Vandersloot <kfv101@psu.edu>
* configure.in: only build battstat on supported platforms. Patch by
Christian Marillat. Fixes part of bug #111466.
geyes:
2003-05-12 Kevin Vandersloot <kfv101@psu.edu>
* themes.c: work on systems not supporting PATH_MAX. Patch by
Christian Marillat. Fixes part of bug #111466
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | configure.in | 8 | ||||
-rw-r--r-- | geyes/ChangeLog | 5 | ||||
-rw-r--r-- | geyes/themes.c | 11 |
4 files changed, 26 insertions, 3 deletions
@@ -1,3 +1,8 @@ +2003-05-12 KEvin Vandersloot <kfv101@psu.edu> + + * configure.in: only build battstat on supported platforms. Patch by + Christian Marillat. Fixes part of bug #111466. + 2003-05-06 Danilo Ĺ egan <dsegan@gmx.net> * configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS. diff --git a/configure.in b/configure.in index d38a68d6e..2975b7ab3 100644 --- a/configure.in +++ b/configure.in @@ -176,12 +176,14 @@ case "${host}" in AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes") AC_SUBST(HAVE_LIBAPM) ;; - *-*-linux*) + # list of supported OS cores + *-*-linux*|*-*-freebsd*|*-*-openbsd*) AC_CHECK_LIB(apm,apm_read,[HAVE_LIBAPM=yes],[HAVE_LIBAPM=no]) AM_CONDITIONAL(HAVE_LIBAPM, test "x$HAVE_LIBAPM" = "xyes") - AC_SUBST(HAVE_LIBAPM) + AC_SUBST(HAVE_LIBAPM) ;; - *solaris*) + *) + echo "warning: ${host} is not supported by battstat_applet, not building" >&2 build_battstat_applet=no ;; esac diff --git a/geyes/ChangeLog b/geyes/ChangeLog index 026307f0c..da826068f 100644 --- a/geyes/ChangeLog +++ b/geyes/ChangeLog @@ -1,3 +1,8 @@ +2003-05-12 Kevin Vandersloot <kfv101@psu.edu> + + * themes.c: work on systems not supporting PATH_MAX. Patch by + Christian Marillat. Fixes part of bug #111466 + 2003-04-26 Dennis Cranston <dennis_cranston at yahoo com> * themes.c: More HIGification of the preferences dialog: adds diff --git a/geyes/themes.c b/geyes/themes.c index 2443610ea..46989ea72 100644 --- a/geyes/themes.c +++ b/geyes/themes.c @@ -219,7 +219,11 @@ properties_cb (BonoboUIComponent *uic, DIR *dfd; struct dirent *dp; int i; +#ifdef PATH_MAX gchar filename [PATH_MAX]; +#else + gchar *filename; +#endif gchar *title; if (eyes_applet->prop_box.pbox) { @@ -308,9 +312,13 @@ properties_cb (BonoboUIComponent *uic, gchar *elems[2] = {NULL, NULL }; gchar *theme_dir; elems[0] = filename; +#ifdef PATH_MAX strcpy (filename, theme_directories[i]); strcat (filename, dp->d_name); +#else + asprintf (&filename, theme_directories[i], dp->d_name); +#endif gtk_list_store_insert (model, &iter, 0); gtk_list_store_set (model, &iter, 0, &filename, -1); theme_dir = g_strdup_printf ("%s/", filename); @@ -330,6 +338,9 @@ properties_cb (BonoboUIComponent *uic, closedir (dfd); } } +#ifndef PATH_MAX + g_free (filename); +#endif gtk_box_pack_start (GTK_BOX (control_vbox), tree, TRUE, TRUE, 0); |