* add some GNMOECC_... in the configure.in to make the make install works better in the capplets * fix a segfault in url-properties if the gconf keys are empty (NULL) -- Jean Schurger fr alcove com - Free Software Engineer Alcove - (+33) 149 226 800 - http://www.alcove.com jschurger schurger org - (+33) 661 415 920 PGP Fingerprint : E6487B18CAD0810469E98869790D563DEBA1535
diff -uNr old/control-center-plus/ChangeLog new/control-center-plus/ChangeLog
--- old/control-center-plus/ChangeLog Fri Jan 4 15:22:16 2002
+++ new/control-center-plus/ChangeLog Fri Jan 11 16:32:11 2002
@@ -1,3 +1,9 @@
+2002-01-11 Jean Schurger <jschurger schurger org>
+
+ * configure.in: Add GNOMECC_GLADE_DIR GNOMECC_PIXMAPS_DIR
+ GNOMECC_ICONS_DIR GNOMECC_DESKTOP_DIR to make the
+ make install work better
+
2002-01-04 Bradford Hovinen <hovinen ximian com>
* configure.in: Add CONTROL_{CFLAGS|LIBS} for theme selector
diff -uNr old/control-center-plus/capplets/theme-switcher/ChangeLog new/control-center-plus/capplets/theme-switcher/ChangeLog
--- old/control-center-plus/capplets/theme-switcher/ChangeLog Fri Jan 4 15:23:23 2002
+++ new/control-center-plus/capplets/theme-switcher/ChangeLog Fri Jan 11 16:34:29 2002
@@ -1,3 +1,7 @@
+2002-01-11 Jean Schurger <jschurger schurger org>
+
+ * Makefile.am fix typo in the .desktop.in line. ( line 29 : > instead of \> )
+
2002-01-04 Bradford Hovinen <hovinen ximian com>
* control/Makefile.am (gnome_theme_preview_LDADD): Use
diff -uNr old/control-center-plus/capplets/theme-switcher/Makefile.am new/control-center-plus/capplets/theme-switcher/Makefile.am
--- old/control-center-plus/capplets/theme-switcher/Makefile.am Fri Jan 4 15:23:23 2002
+++ new/control-center-plus/capplets/theme-switcher/Makefile.am Fri Jan 11 16:28:25 2002
@@ -26,7 +26,7 @@
@INTLTOOL_DESKTOP_RULE@
## @GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
$(desktop).in: %.desktop.in: %.desktop.in.in
- sed s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png# < $< \> ${cappletname}.desktop.in
+ sed s#Icon=.\*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png# < $< > ${cappletname}.desktop.in
install-data-local:
$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)
@@ -37,7 +37,7 @@
INCLUDES = $(GNOMECC_CAPPLETS_CFLAGS)
CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
-EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST)
iconsdir = $(GNOMECC_DATA_DIR)/icons
Gladedir = $(GNOMECC_DATA_DIR)/interfaces
pixmapdir = $(GNOMECC_DATA_DIR)/pixmaps
diff -uNr old/control-center-plus/capplets/url-properties/ChangeLog new/control-center-plus/capplets/url-properties/ChangeLog
--- old/control-center-plus/capplets/url-properties/ChangeLog Sun Dec 9 01:53:47 2001
+++ new/control-center-plus/capplets/url-properties/ChangeLog Fri Jan 11 16:37:29 2002
@@ -1,3 +1,7 @@
+2002-01-11 Jean Schurger <jschurger schurger org>
+
+ * url-properties.c (url_capplet_refill_clist) : fix segfault if nothing in the gconf keys (NULL)
+
2001-12-08 Richard Hestilow <hestilow ximian com>
* url-properties.c: Port to GConf.
diff -uNr old/control-center-plus/capplets/url-properties/url-properties.c new/control-center-plus/capplets/url-properties/url-properties.c
--- old/control-center-plus/capplets/url-properties/url-properties.c Sun Dec 9 13:19:41 2001
+++ new/control-center-plus/capplets/url-properties/url-properties.c Fri Jan 11 16:36:30 2002
@@ -174,11 +174,16 @@
l = gconf_client_all_entries (client, "/desktop/gnome/url-handlers", NULL);
for (; l != NULL; l = l->next)
{
+ int len;
GConfEntry *e = l->data;
gchar *key = g_strdup (e->key);
- gchar *value = g_strdup (gconf_value_get_string (gconf_entry_get_value (e)));
- int len = strlen(key);
-
+ gchar *value;
+ if (gconf_entry_get_value (e) != NULL) {
+ value = gconf_value_get_string (gconf_entry_get_value (e)); /* gconf_entry_get_value is a macro */
+ value = g_strdup(value);
+ } else
+ value = g_strdup("");
+ len = strlen(key);
if (len > 5 && !strcmp(&key[len-5], "-show")) {
gchar *row[2];
gint id;
diff -uNr old/control-center-plus/configure.in new/control-center-plus/configure.in
--- old/control-center-plus/configure.in Fri Jan 4 15:22:16 2002
+++ new/control-center-plus/configure.in Fri Jan 11 16:12:11 2002
@@ -86,9 +86,25 @@
dnl ==============================================
dnl Define the directories
dnl ==============================================
+if test "x${prefix}" = "xNONE"; then
+ real_prefix=${ac_default_prefix}
+else
+ real_prefix=${prefix}
+fi
+
AC_DEFINE_UNQUOTED(GNOMECC_DATA_DIR, "${real_prefix}/share/${PACKAGE}")
-GNOMECC_DATA_DIR=""${datadir}/${PACKAGE}""
+GNOMECC_GLADE_DIR="${datadir}/${PACKAGE}/interfaces"
+GNOMECC_PIXMAPS_DIR="${datadir}/${PACKAGE}/pixmaps"
+GNOMECC_ICONS_DIR="${datadir}/${PACKAGE}/icons"
+GNOMECC_DESKTOP_DIR="${datadir}/${PACKAGE}/capplets"
+
AC_SUBST(GNOMECC_DATA_DIR)
+AC_SUBST(GNOMECC_GLADE_DIR)
+AC_SUBST(GNOMECC_PIXMAPS_DIR)
+AC_SUBST(GNOMECC_ICONS_DIR)
+AC_SUBST(GNOMECC_DESKTOP_DIR)
+
+
dnl ==============================================
dnl End: Define the directories
dnl ==============================================
Attachment:
pgpPYCVADV45h.pgp
Description: PGP signature