+++ /dev/null
-diff -Nur control-center-1.99.8/Makefile.am control-center-1.99.8.new/Makefile.am
---- control-center-1.99.8/Makefile.am Thu Apr 11 04:06:40 2002
-+++ control-center-1.99.8.new/Makefile.am Tue Apr 30 03:23:48 2002
-@@ -1,4 +1,4 @@
--SUBDIRS = help po libsounds libbackground gnome-settings-daemon capplets control-center idl schemas
-+SUBDIRS = po libsounds libbackground gnome-settings-daemon capplets control-center idl schemas
-
- #I removed the root-manager for now
- #
-diff -Nur control-center-1.99.8/configure.in control-center-1.99.8.new/configure.in
---- control-center-1.99.8/configure.in Mon Apr 29 21:45:06 2002
-+++ control-center-1.99.8.new/configure.in Tue Apr 30 03:23:38 2002
-@@ -210,6 +210,4 @@
- capplets/accessibility/keyboard/Makefile
- capplets/network/Makefile
- schemas/Makefile
--help/Makefile
--help/C/Makefile
- libsounds/Makefile])
-diff -Nur control-center-1.99.8/schemas/Makefile.am control-center-1.99.8.new/schemas/Makefile.am
---- control-center-1.99.8/schemas/Makefile.am Tue Mar 26 18:22:22 2002
-+++ control-center-1.99.8.new/schemas/Makefile.am Tue Apr 30 03:15:49 2002
-@@ -5,7 +5,4 @@
-
- schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
-
--install-data-local: $(schema_installed_data)
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data)
--
- EXTRA_DIST=$(schema_DATA)
+++ /dev/null
---- control-center-2.0.0/schemas/Makefile.am.wiget Tue Jun 18 13:15:59 2002
-+++ control-center-2.0.0/schemas/Makefile.am Tue Jun 18 13:21:03 2002
-@@ -6,6 +6,8 @@
- schema_source_data = $(foreach file, $(schema_DATA), $(srcdir)/$(file))
-
- install-data-local: $(schema_installed_data)
-- GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data)
-+ if [ "x" = "x$(DESTDIR)" ] ; then \
-+ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(schema_source_data) ;\
-+ fi
-
- EXTRA_DIST=$(schema_DATA)
+++ /dev/null
-diff -urN control-center-2.1.0.orig/configure.in control-center-2.1.0/configure.in
---- control-center-2.1.0.orig/configure.in Sat Sep 28 01:28:10 2002
-+++ control-center-2.1.0/configure.in Sat Sep 28 01:29:16 2002
-@@ -253,6 +253,5 @@
- capplets/windows/Makefile
- schemas/Makefile
- libsounds/Makefile
--dnl due to a bug in intltool we need to expand something from the root last
- control-center.spec
- ])
--- /dev/null
+diff -urN control-center-1.4.0.1.org/configure.in control-center-1.4.0.1/configure.in
+--- control-center-1.4.0.1.org/configure.in Sat Apr 7 15:26:26 2001
++++ control-center-1.4.0.1/configure.in Sat Apr 7 15:26:51 2001
+@@ -44,7 +44,7 @@
+ AM_CONDITIONAL(FALSE, test "x" = "y")
+
+ ALL_LINGUAS="az bg ca cs da de el en_GB es et eu fi fr ga gl hr hu it ja ko lt nl no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN.GB2312 zh_TW.Big5"
+-AM_GNOME_GETTEXT
++AM_GNU_GETTEXT
+
+ AC_SUBST(CFLAGS)
+ AC_SUBST(LDFLAGS)
--- /dev/null
+--- control-center-1.0.5/capplets/background-properties/property-background.c.limitedbgs Fri Apr 2 17:16:33 1999
++++ control-center-1.0.5/capplets/background-properties/property-background.c Mon Apr 5 17:09:53 1999
+@@ -19,6 +19,8 @@
+ #include <gnome.h>
+ #include "imlib-misc.h"
+
++#define MAX_NUMBER_OF_WP 8
++
+ static GtkWidget *capplet=NULL;
+
+ static GtkWidget *preview;
+@@ -31,6 +33,7 @@
+ static gint wpNum;
+ static gint fillPreview = TRUE;
+ static gint ignoreChanges = TRUE;
++static GList *wplist = NULL;
+
+ enum {
+ WALLPAPER_TILED,
+@@ -758,26 +761,17 @@
+ /* hack */
+ if (!ignoreChanges && found < 0) {
+
+- cf = gtk_menu_item_new_with_label (str);
+- gtk_signal_connect (GTK_OBJECT (cf),
+- "activate",
+- (GtkSignalFunc) browse_activated, str);
+- gtk_menu_append (GTK_MENU (wpMenu), cf);
+- gtk_widget_show (cf);
+- wpNum++;
+-
+- gs = g_string_new ("/Background/Default/wallpaper");
+- snprintf (num, sizeof(num), "%d", wpNum);
+- g_string_append (gs, num);
+- gnome_config_set_string (gs->str, str);
+- g_string_free (gs, TRUE);
+-
+- gnome_config_set_int ("/Background/Default/wallpapers", wpNum);
+- gnome_config_set_string ("/Background/Default/wallpapers_dir",
+- str);
+-
+- found = wpNum;
+- gnome_config_sync ();
++ cf = gtk_menu_item_new_with_label (str);
++ gtk_signal_connect (GTK_OBJECT (cf),
++ "activate",
++ (GtkSignalFunc) browse_activated, str);
++ gtk_menu_append (GTK_MENU (wpMenu), cf);
++ gtk_widget_show (cf);
++ wpNum++;
++
++ wplist = g_list_prepend (wplist, g_strdup (str));
++ found = wpNum;
++ gnome_config_sync ();
+ }
+
+ if (curState.wpFileName)
+@@ -785,7 +779,7 @@
+ curState.wpFileName = g_strdup(str);
+ curState.bgType = BACKGROUND_WALLPAPER;
+
+- gtk_option_menu_set_history (GTK_OPTION_MENU (wpOMenu), found);
++ gtk_option_menu_set_history (GTK_OPTION_MENU (wpOMenu), found - 1);
+
+ fill_monitor (!ignoreChanges, &curState);
+
+@@ -960,31 +954,31 @@
+ (GtkSignalFunc) browse_activated, NULL);
+
+ wpNum = gnome_config_get_int ("/Background/Default/wallpapers=0");
+-
+ for (i = 0; i<wpNum; i++) {
+-
+- /* printf ("wallpaper%d", i); */
+- wpName = g_string_new ("/Background/Default/wallpaper");
+- snprintf (num, sizeof(num),"%d", i+1);
+- g_string_append (wpName, num);
+- g_string_append (wpName, "=???");
+-
+- wpName1 = gnome_config_get_string (wpName->str);
+- /* printf (": %s\n", wpName1); */
+- if (wpName1) {
+- if (state->wpFileName)
+- if (!strcmp (wpName1, state->wpFileName))
+- selectedWp = i + 1;
+-
+- none = gtk_menu_item_new_with_label (wpName1);
+- gtk_menu_append (GTK_MENU (wpMenu), none);
+- gtk_signal_connect (GTK_OBJECT (none),
+- "activate",
+- (GtkSignalFunc) browse_activated, wpName1);
+- gtk_widget_show (none);
+- }
+-
+- g_string_free (wpName, TRUE);
++ wpName = g_string_new ("/Background/Default/wallpaper");
++ snprintf (num, sizeof(num),"%d", i);
++ g_string_append (wpName, num);
++ if (i > MAX_NUMBER_OF_WP) {
++ /* We want to blow away the old ones. */
++ gnome_config_clean_key (wpName->str);
++ } else {
++ /* printf ("wallpaper%d", i); */
++
++ wpName1 = gnome_config_get_string (wpName->str);
++ if (wpName1) {
++ if (state->wpFileName)
++ if (!strcmp (wpName1, state->wpFileName))
++ selectedWp = i + 1;
++ none = gtk_menu_item_new_with_label (wpName1);
++ wplist = g_list_prepend (wplist, g_strdup (wpName1));
++ gtk_menu_append (GTK_MENU (wpMenu), none);
++ gtk_signal_connect (GTK_OBJECT (none),
++ "activate",
++ (GtkSignalFunc) browse_activated, wpName1);
++ gtk_widget_show (none);
++ }
++ }
++ g_string_free (wpName, TRUE);
+ }
+
+ wpOMenu = gtk_option_menu_new ();
+@@ -1137,7 +1131,7 @@
+ background_try(GtkWidget *widget, struct bgState *state)
+ {
+
+-printState(state);
++/*printState(state);*/
+ background_apply(state);
+ }
+
+@@ -1166,7 +1160,8 @@
+ background_write (struct bgState *state)
+ {
+ char buffer [60];
+-
++ GList *list;
++ gint i = 0;
+
+ snprintf (buffer, sizeof(buffer), "#%02x%02x%02x",
+ state->bgColor1.red >> 8,
+@@ -1189,11 +1184,17 @@
+ gnome_config_set_string ("/Background/Default/wallpaper",
+ (state->bgType == BACKGROUND_SIMPLE) ? "none" : state->wpFileName);
+ gnome_config_set_int ("/Background/Default/wallpaperAlign", state->wpType);
++ for (list = wplist; list; list = list->next) {
++/* if (i > MAX_NUMBER_OF_WP)
++ break;*/
++ snprintf (buffer, sizeof(buffer), "/Background/Default/wallpaper%d", i);
++ gnome_config_set_string (buffer, (gchar *) list->data);
++ i++;
++ }
++ gnome_config_set_int ("/Background/Default/wallpapers", i - 1);
+
+ gnome_config_sync ();
+-#if 0
+- background_apply(state);
+-#endif
++
+ }
+
+ void
+++ /dev/null
-diff -urN aaa/control-center-2.1.0/capplets/theme-switcher/Makefile.am control-center-2.1.0/capplets/theme-switcher/Makefile.am
---- aaa/control-center-2.1.0/capplets/theme-switcher/Makefile.am Mon Aug 19 21:04:48 2002
-+++ control-center-2.1.0/capplets/theme-switcher/Makefile.am Tue Oct 1 21:09:46 2002
-@@ -2,7 +2,7 @@
-
- gnome_theme_properties_LDADD = \
- $(GNOMECC_CAPPLETS_LIBS) \
-- -L$(top_builddir)/libwindow-settings/ -lgnome-window-settings
-+ $(top_builddir)/libwindow-settings/.libs/libgnome-window-settings.so
-
- gnome_theme_properties_SOURCES = \
- theme-switcher.c
-
+++ /dev/null
-#
-# No modifications of this Makefile should be necessary.
-#
-# This file contains the build instructions for installing OMF files. It is
-# generally called from the makefiles for particular formats of documentation.
-#
-# Note that you must configure your package with --localstatedir=/var/lib
-# so that the scrollkeeper-update command below will update the database
-# in the standard scrollkeeper directory.
-#
-# If it is impossible to configure with --localstatedir=/var/lib, then
-# modify the definition of scrollkeeper_localstate_dir so that
-# it points to the correct location. Note that you must still use
-# $(localstatedir) in this or when people build RPMs it will update
-# the real database on their system instead of the one under RPM_BUILD_ROOT.
-#
-# Note: This make file is not incorporated into xmldocs.make because, in
-# general, there will be other documents install besides XML documents
-# and the makefiles for these formats should also include this file.
-#
-# About this file:
-# This file was taken from scrollkeeper_example2, a package illustrating
-# how to install documentation and OMF files for use with ScrollKeeper
-# 0.3.x and 0.4.x. For more information, see:
-# http://scrollkeeper.sourceforge.net/
-# Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-omf_dest_dir=$(datadir)/omf/@PACKAGE@
-scrollkeeper_localstate_dir = $(localstatedir)/scrollkeeper
-
-omf: omf_timestamp
-
-omf_timestamp: $(omffile)
- -for file in $(omffile); do \
- scrollkeeper-preinstall $(docdir)/$(docname).xml $(srcdir)/$$file $$file.out; \
- done
- touch omf_timestamp
-
-install-data-hook-omf:
- $(mkinstalldirs) $(DESTDIR)$(omf_dest_dir)
- for file in $(omffile); do \
- $(INSTALL_DATA) $$file.out $(DESTDIR)$(omf_dest_dir)/$$file; \
- done
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir) -o $(DESTDIR)$(omf_dest_dir)
-
-uninstall-local-omf:
- -for file in $(srcdir)/*.omf; do \
- basefile=`basename $$file`; \
- rm -f $(omf_dest_dir)/$$basefile; \
- done
- -rmdir $(omf_dest_dir)
- -scrollkeeper-update -p $(scrollkeeper_localstate_dir)
+++ /dev/null
-#
-# No modifications of this Makefile should be necessary.
-#
-# To use this template:
-# 1) Define: figdir, docname, lang, omffile, and entities in
-# your Makefile.am file for each document directory,
-# although figdir, omffile, and entities may be empty
-# 2) Make sure the Makefile in (1) also includes
-# "include $(top_srcdir)/xmldocs.make" and
-# "dist-hook: app-dist-hook".
-# 3) Optionally define 'entities' to hold xml entities which
-# you would also like installed
-# 4) Figures must go under $(figdir)/ and be in PNG format
-# 5) You should only have one document per directory
-# 6) Note that the figure directory, $(figdir)/, should not have its
-# own Makefile since this Makefile installs those figures.
-#
-# example Makefile.am:
-# figdir = figures
-# docname = scrollkeeper-manual
-# lang = C
-# omffile=scrollkeeper-manual-C.omf
-# entities = fdl.xml
-# include $(top_srcdir)/xmldocs.make
-# dist-hook: app-dist-hook
-#
-# About this file:
-# This file was taken from scrollkeeper_example2, a package illustrating
-# how to install documentation and OMF files for use with ScrollKeeper
-# 0.3.x and 0.4.x. For more information, see:
-# http://scrollkeeper.sourceforge.net/
-# Version: 0.1.2 (last updated: March 20, 2002)
-#
-
-
-# ************* Begin of section some packagers may need to modify **************
-# This variable (docdir) specifies where the documents should be installed.
-# This default value should work for most packages.
-# docdir = $(datadir)/@PACKAGE@/doc/$(docname)/$(lang)
-docdir = $(datadir)/gnome/help/$(docname)/$(lang)
-
-# ************** You should not have to edit below this line *******************
-xml_files = $(entities)
-
-EXTRA_DIST = $(xml_files) $(omffile)
-CLEANFILES = omf_timestamp
-
-include $(top_srcdir)/omf.make
-
-all: omf
-
-$(docname).xml: $(entities)
- -ourdir=`pwd`; \
- cd $(srcdir); \
- cp $(entities) $$ourdir
-
-app-dist-hook:
- if test "$(figdir)"; then \
- $(mkinstalldirs) $(distdir)/$(figdir); \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(distdir)/$(figdir)/$$basefile; \
- done \
- fi
-
-install-data-local: omf
- $(mkinstalldirs) $(DESTDIR)$(docdir)
- for file in $(xml_files); do \
- cp $(srcdir)/$$file $(DESTDIR)$(docdir); \
- done
- if test "$(figdir)"; then \
- $(mkinstalldirs) $(DESTDIR)$(docdir)/$(figdir); \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- $(INSTALL_DATA) $$file $(DESTDIR)$(docdir)/$(figdir)/$$basefile; \
- done \
- fi
-
-install-data-hook: install-data-hook-omf
-
-uninstall-local: uninstall-local-doc uninstall-local-omf
-
-uninstall-local-doc:
- -if test "$(figdir)"; then \
- for file in $(srcdir)/$(figdir)/*.png; do \
- basefile=`echo $$file | sed -e 's,^.*/,,'`; \
- rm -f $(docdir)/$(figdir)/$$basefile; \
- done; \
- rmdir $(DESTDIR)$(docdir)/$(figdir); \
- fi
- -for file in $(xml_files); do \
- rm -f $(DESTDIR)$(docdir)/$$file; \
- done
- -rmdir $(DESTDIR)$(docdir)
-
projects / packages / control-center.git / commitdiff