diff -crN ./control-center/capplets/accessibility/keyboard/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/accessibility/keyboard/Makefile.am *** ./control-center/capplets/accessibility/keyboard/Makefile.am Tue Jun 18 20:55:04 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/accessibility/keyboard/Makefile.am Tue Jul 8 14:32:52 2003 *************** *** 1,4 **** --- 1,5 ---- noinst_LIBRARIES = libaccessibility-keyboard.a + bin_PROGRAMS = gnome-accessibility-keyboard-properties libaccessibility_keyboard_a_SOURCES = \ accessibility-keyboard.c \ diff -crN ./control-center/capplets/accessibility/keyboard/accessibility-keyboard.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/accessibility/keyboard/accessibility-keyboard.c *** ./control-center/capplets/accessibility/keyboard/accessibility-keyboard.c Wed Jan 8 08:40:50 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/accessibility/keyboard/accessibility-keyboard.c Tue Jul 8 14:33:23 2003 *************** *** 25,36 **** # include #endif #include #include #include #include #include - #include #include "capplet-util.h" #include "capplet-stock-icons.h" --- 25,36 ---- # include #endif + #include #include #include #include #include #include #include "capplet-util.h" #include "capplet-stock-icons.h" diff -crN ./control-center/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c *** ./control-center/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c Tue Jan 7 15:01:28 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/accessibility/keyboard/gnome-accessibility-keyboard-properties.c Tue Jul 8 14:33:55 2003 *************** *** 33,40 **** #include "accessibility-keyboard.h" #ifdef HAVE_X11_EXTENSIONS_XKB_H # include - # include # include # include --- 33,40 ---- #include "accessibility-keyboard.h" #ifdef HAVE_X11_EXTENSIONS_XKB_H + # include # include # include # include diff -crN ./control-center/capplets/common/capplet-util.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/common/capplet-util.h *** ./control-center/capplets/common/capplet-util.h Fri Aug 9 19:55:52 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/common/capplet-util.h Tue Jul 8 14:35:10 2003 *************** *** 32,48 **** /* Print a debugging message */ ! #ifdef G_HAVE_ISO_VARARGS ! # define DEBUG_MSG(str, ...) \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \ getpid (), G_GNUC_FUNCTION, __VA_ARGS__) ! #elif defined(G_HAVE_GNUC_VARARGS) ! # define DEBUG_MSG(str, args...) \ ! g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \ ! getpid (), G_GNUC_FUNCTION, args) ! #else ! # define DEBUG_MSG(str, args...) ! #endif /* Retrieve a widget from the Glade object */ --- 32,43 ---- /* Print a debugging message */ ! /* cpp on AIX does not accept "...", variables parameters in macros */ ! /* ! #define DEBUG_MSG(str, ...) \ g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, "(%d:%s) " str, \ getpid (), G_GNUC_FUNCTION, __VA_ARGS__) ! */ /* Retrieve a widget from the Glade object */ diff -crN ./control-center/capplets/common/gnome-theme-info.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/common/gnome-theme-info.h *** ./control-center/capplets/common/gnome-theme-info.h Mon Jan 13 21:21:26 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/common/gnome-theme-info.h Tue Jul 8 14:35:38 2003 *************** *** 32,38 **** typedef enum { GNOME_THEME_TYPE_METATHEME, GNOME_THEME_TYPE_ICON, ! GNOME_THEME_TYPE_REGULAR, } GnomeThemeType; typedef enum { --- 32,38 ---- typedef enum { GNOME_THEME_TYPE_METATHEME, GNOME_THEME_TYPE_ICON, ! GNOME_THEME_TYPE_REGULAR } GnomeThemeType; typedef enum { *************** *** 45,51 **** typedef enum { GNOME_THEME_METACITY = 1 << 0, GNOME_THEME_GTK_2 = 1 << 1, ! GNOME_THEME_GTK_2_KEYBINDING = 1 << 2, } GnomeThemeElement; --- 45,51 ---- typedef enum { GNOME_THEME_METACITY = 1 << 0, GNOME_THEME_GTK_2 = 1 << 1, ! GNOME_THEME_GTK_2_KEYBINDING = 1 << 2 } GnomeThemeElement; diff -crN ./control-center/capplets/default-applications/gnome-default-applications-properties.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/default-applications/gnome-default-applications-properties.c *** ./control-center/capplets/default-applications/gnome-default-applications-properties.c Wed Mar 12 17:37:37 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/default-applications/gnome-default-applications-properties.c Tue Jul 8 14:36:11 2003 *************** *** 27,37 **** # include #endif #include #include #include #include - #include #include #include --- 27,38 ---- # include #endif + /* [BT] math.h moved before gnome.h to avoid redefinition of M_PI & M_SQRT2 */ #include + #include #include #include #include #include #include diff -crN ./control-center/capplets/desktop-links/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/desktop-links/Makefile.am *** ./control-center/capplets/desktop-links/Makefile.am Fri Dec 6 11:53:21 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/desktop-links/Makefile.am Tue Aug 12 16:23:30 2003 *************** *** 4,10 **** ## Pixmaps pixmaps_pre = $(capplets:=-capplet.png) ! pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png pixmapsdir = $(GNOMECC_ICONS_DIR) ## --- 4,11 ---- ## Pixmaps pixmaps_pre = $(capplets:=-capplet.png) ! pixmaps_DATA = $(pixmaps_pre) accessibility-directory.png \ ! advanced-directory.png pixmapsdir = $(GNOMECC_ICONS_DIR) ## *************** *** 48,51 **** --- 49,57 ---- %.directory.in: $(srcdir)/%.directory.in.in sed s#Icon=#Icon=$(pixmapsdir)/# < $< > $@ + #%.directory.in: $(srcdir)/%.directory.in.in + # sed s#Icon=#Icon=# < $< > $@ + + + @INTLTOOL_DIRECTORY_RULE@ diff -crN ./control-center/capplets/desktop-links/advanced-directory.png /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/desktop-links/advanced-directory.png Binary files ./control-center/capplets/desktop-links/advanced-directory.png and /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/desktop-links/advanced-directory.png differ diff -crN ./control-center/capplets/file-types/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/file-types/Makefile.am *** ./control-center/capplets/file-types/Makefile.am Sat Aug 31 19:06:36 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/file-types/Makefile.am Tue Jul 8 14:36:41 2003 *************** *** 2,8 **** bin_PROGRAMS = gnome-file-types-properties ! gnome_file_types_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(VFS_CAPPLET_LIBS) libuuid/libuuid.a -lpopt gnome_file_types_properties_SOURCES = \ file-types-capplet.c \ --- 2,8 ---- bin_PROGRAMS = gnome-file-types-properties ! gnome_file_types_properties_LDADD = $(GNOMECC_CAPPLETS_LIBS) $(VFS_CAPPLET_LIBS) $(POPT_LIBS) libuuid/libuuid.a gnome_file_types_properties_SOURCES = \ file-types-capplet.c \ diff -crN ./control-center/capplets/keybindings/eggcellrendererkeys.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/keybindings/eggcellrendererkeys.c *** ./control-center/capplets/keybindings/eggcellrendererkeys.c Mon Jan 13 21:21:27 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/keybindings/eggcellrendererkeys.c Tue Jul 8 14:37:11 2003 *************** *** 583,589 **** void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, guint keyval, ! GdkModifierType mask) { char *text; gboolean changed; --- 583,589 ---- void egg_cell_renderer_keys_set_accelerator (EggCellRendererKeys *keys, guint keyval, ! EggVirtualModifierType mask) { char *text; gboolean changed; *************** *** 624,630 **** void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, guint *keyval, ! GdkModifierType *mask) { g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); --- 624,630 ---- void egg_cell_renderer_keys_get_accelerator (EggCellRendererKeys *keys, guint *keyval, ! EggVirtualModifierType *mask) { g_return_if_fail (EGG_IS_CELL_RENDERER_KEYS (keys)); diff -crN ./control-center/capplets/keybindings/eggcellrendererkeys.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/keybindings/eggcellrendererkeys.h *** ./control-center/capplets/keybindings/eggcellrendererkeys.h Fri Aug 23 07:03:16 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/keybindings/eggcellrendererkeys.h Tue Jul 8 14:37:42 2003 *************** *** 39,45 **** typedef enum { EGG_CELL_RENDERER_KEYS_MODE_GTK, ! EGG_CELL_RENDERER_KEYS_MODE_X, } EggCellRendererKeysMode; struct _EggCellRendererKeys --- 39,45 ---- typedef enum { EGG_CELL_RENDERER_KEYS_MODE_GTK, ! EGG_CELL_RENDERER_KEYS_MODE_X } EggCellRendererKeysMode; struct _EggCellRendererKeys diff -crN ./control-center/capplets/mouse/gnome-mouse-properties.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/mouse/gnome-mouse-properties.c *** ./control-center/capplets/mouse/gnome-mouse-properties.c Wed Mar 12 17:37:44 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/mouse/gnome-mouse-properties.c Tue Jul 8 14:38:23 2003 *************** *** 28,38 **** #endif #include #include #include #include #include - #include #include "capplet-util.h" #include "gconf-property-editor.h" --- 28,38 ---- #endif #include + #include #include #include #include #include #include "capplet-util.h" #include "gconf-property-editor.h" *************** *** 83,89 **** { DOUBLE_CLICK_TEST_OFF, DOUBLE_CLICK_TEST_MAYBE, ! DOUBLE_CLICK_TEST_ON, }; enum --- 83,89 ---- { DOUBLE_CLICK_TEST_OFF, DOUBLE_CLICK_TEST_MAYBE, ! DOUBLE_CLICK_TEST_ON }; enum diff -crN ./control-center/capplets/theme-switcher/gnome-theme-manager.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/theme-switcher/gnome-theme-manager.c *** ./control-center/capplets/theme-switcher/gnome-theme-manager.c Wed Mar 12 17:37:58 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/theme-switcher/gnome-theme-manager.c Tue Jul 8 14:38:53 2003 *************** *** 57,64 **** static gboolean initial_meta_theme_set = FALSE; static GdkPixbuf *default_image = NULL; ! static GnomeThemeMetaInfo custom_meta_theme_info = {}; ! static GnomeThemeMetaInfo initial_meta_theme_info = {}; /* Function Prototypes */ static void idle_async_func (GdkPixbuf *pixbuf, --- 57,64 ---- static gboolean initial_meta_theme_set = FALSE; static GdkPixbuf *default_image = NULL; ! static GnomeThemeMetaInfo custom_meta_theme_info = {0}; ! static GnomeThemeMetaInfo initial_meta_theme_info = {0}; /* Function Prototypes */ static void idle_async_func (GdkPixbuf *pixbuf, diff -crN ./control-center/capplets/theme-switcher/gnome-theme-manager.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/theme-switcher/gnome-theme-manager.h *** ./control-center/capplets/theme-switcher/gnome-theme-manager.h Thu Jan 16 02:16:36 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/theme-switcher/gnome-theme-manager.h Tue Jul 8 14:39:20 2003 *************** *** 23,29 **** enum { TARGET_URI_LIST, ! TARGET_NS_URL, }; /* model info */ --- 23,29 ---- enum { TARGET_URI_LIST, ! TARGET_NS_URL }; /* model info */ *************** *** 39,45 **** { THEME_FLAG_DEFAULT = 1 << 0, THEME_FLAG_CUSTOM = 1 << 1, ! THEME_FLAG_INITIAL = 1 << 2, }; extern GtkTargetEntry drop_types[]; --- 39,45 ---- { THEME_FLAG_DEFAULT = 1 << 0, THEME_FLAG_CUSTOM = 1 << 1, ! THEME_FLAG_INITIAL = 1 << 2 }; extern GtkTargetEntry drop_types[]; diff -crN ./control-center/capplets/theme-switcher/gnome-theme-save.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/theme-switcher/gnome-theme-save.c *** ./control-center/capplets/theme-switcher/gnome-theme-save.c Tue Jan 21 06:50:29 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/capplets/theme-switcher/gnome-theme-save.c Tue Jul 8 14:39:50 2003 *************** *** 9,15 **** static GQuark error_quark; enum { ! INVALID_THEME_NAME, }; /* taken from gnome-desktop-item.c */ --- 9,15 ---- static GQuark error_quark; enum { ! INVALID_THEME_NAME }; /* taken from gnome-desktop-item.c */ diff -crN ./control-center/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/configure.in *** ./control-center/configure.in Thu Mar 13 16:50:25 2003 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/configure.in Tue Jul 8 14:40:18 2003 *************** *** 32,44 **** AM_GLIB_GNU_GETTEXT ! AC_CHECK_FUNCS(usleep) ! AC_CHECK_FUNCS(putenv,[AC_DEFINE(HAVE_PUTENV,,[putenv])]) ! AC_CHECK_FUNCS(setenv,[AC_DEFINE(HAVE_SETENV,,[setenv])]) AC_PATH_XTRA x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" dnl keyboard-properties-capplet savecppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" --- 32,48 ---- AM_GLIB_GNU_GETTEXT ! AC_CHECK_FUNCS(usleep putenv setenv) AC_PATH_XTRA x_libs="$X_PRE_LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" + AC_CHECK_LIB(popt, poptGetArg, POPT_LIBS=-lpopt, + [AC_CHECK_HEADER(popt.h, , AC_MSG_ERROR([[ + *** Couldn't find popt. Please download and install from + *** ftp://ftp.rpm.org/pub/rpm/dist/rpm-4.0.x/ and try again.]]))]) + AC_SUBST(POPT_LIBS) + dnl keyboard-properties-capplet savecppflags=$CPPFLAGS CPPFLAGS="$CPPFLAGS $X_CFLAGS" diff -crN ./control-center/control-center/capplet-dir-view.h /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/control-center/capplet-dir-view.h *** ./control-center/control-center/capplet-dir-view.h Tue Oct 1 17:14:13 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/control-center/capplet-dir-view.h Tue Jul 8 14:40:47 2003 *************** *** 54,59 **** --- 54,60 ---- GtkWidget *(*create) (CappletDirView *); }; + /* [BT] Comma removed after LAYOUT_ICON_LIST, added before LAYOUT_HTML */ typedef enum _CappletDirViewLayout { LAYOUT_NONE, LAYOUT_ICON_LIST diff -crN ./control-center/libwindow-settings/Makefile.am /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/libwindow-settings/Makefile.am *** ./control-center/libwindow-settings/Makefile.am Thu Oct 31 23:58:17 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./control-center/libwindow-settings/Makefile.am Tue Jul 8 14:41:17 2003 *************** *** 15,20 **** --- 15,23 ---- -export_dynamic \ -version-info 1:0:0 + libgnome_window_settings_la_LIBADD = \ + @GNOMECC_LIBS@ + libgnome_window_settings_la_SOURCES = \ gnome-window-manager.c \ gnome-window-manager.h \ *************** *** 48,51 **** metacity-window-manager.h libmetacity_la_LDFLAGS = $(wms_flags) ! #libmetacity_la_LIBADD = $(top_builddir)/libwindow-settings/libwindow-settings.la --- 51,56 ---- metacity-window-manager.h libmetacity_la_LDFLAGS = $(wms_flags) ! libmetacity_la_LIBADD = \ ! @GNOME_LIBS@ \ ! $(top_builddir)/libwindow-settings/libgnome-window-settings.la