Update to 2.14.0:

gnome-control-center 2.14.0

default applications:
- Use correct text domain name (Luca Cavalli) (332833)
- Fixed response to icon theme changes (Luca Cavalli) (330154)
- Compilation fixes (Luca Cavalli) (332973)
- Don't use deprecated gtk_entry_set_editable (Luca Cavalli) (329193)

settings daemon:
- Removed spawning of esd (Rodrigo Moya)
- Register the settings daemon per DISPLAY (Michael Witrant) (94049)

sound:
- Mark missing strings for translation (Rodrigo Moya) (333125)

help:
- Pruned capplets documentation, and link to the user's guide (Joachim Noreiko)
  (332184)

general:
- Fixed compilation with GStreamer 0.8 (Mathis Hasselmann) (333119)

updated translations:
- bg (Alexander Shopov)
- bn (Runa Bhattacharjee)
- ca (Josep Puigdemont i Casamajó)
- cs (Miloslav Trmac)
- cy (Rhys Jones)
- da (Ole Laursen)
- de (Hendrik Richter, Hendrik Brandt)
- el (Simos Xenitellis)
- es (Francisco Javier F. Serrador)
- et (Priit Laes)
- fa (Roozbeh Pournader)
- fi (Ilkka Tuohela)
- gl (Ignacio Casal Quinteiro)
- gu (Ankit Patel)
- hu (Gabor Kelemen)
- it (Luca Ferretti)
- ja (Satoru SATOH)
- lt (Zygimantas Berucka)
- nb (Kjartan Maraas)
- nl (Vincent van Adrighem)
- nn (Kjartan Maraas)
- no (Kjartan Maraas)
- pl (Artur Flinta)
- pt (Duarte Loreto)
- pt_BR (Lucas Rocha)
- ru (Leonid Kanter)
- sq (Laurent Dhima)
- sr (Danilo Segan)
- sr@Latn (Danilo Segan)
- sv (Daniel Nylander)
- th (Theppitak Karoonboonyanan)
- uk (Maxim Dziumanenko)
- vi (Clytie Siddall)
- zh_CN (Funda Wang)

------------------------------------------------------------------------------
gnome-control-center 2.13.93

default applications:
- Fixed hang with multiple windows opened (Luca Cavalli) (328094)
- Fixed Sylpheed claws executable name (Fryderyk Dziarmagowski) (332659)
- Fixed typos (Glynn Foster)

fontilus:
- Fixed crash when changing metacity font (Rodrigo Moya) (327021)

mouse:
- Use "milliseconds" instead of "microseconds" (Anilkumar Bacheli) (330588)

sound:
- Fixed memory leaks (Rodrigo Moya) (332530)

settings daemon:
- C89 compilation fixes (Jens Granseuer) (331168)

updated translations:
- bg (Alexander Shopov)
- ca (Josep Puigdemont i Casamajó)
- cs (Miloslav Trmac and Jakub Friedl)
- cy (Rhys Jones)
- de (Hendrik Richter)
- el (Kostas Papadimas)
- es (Francisco Javier F. Serrador)
- et (Priit Laes)
- eu (Iñaki Larrañaga)
- fi (Ilkka Tuohela)
- gl (Ignacio Casal Quinteiro)
- gu (Ankit Patel)
- hu (Gabor Kelemen)
- ja (Satoru SATOH and Takeshi AIHANA)
- ka (Alexander Didebulidze)
- lt (Zygimantas Berucka)
- nb (Kjartan Maraas)
- nl (Vincent van Adrighem)
- no (Kjartan Maraas)
- pt (Duarte Loreto)
- pt_BR (Raphael Higino)
- sr (Slobodan D. Sredojevic)
- sr@Latn (Slobodan D. Sredojevic)
- th (Theppitak Karoonboonyanan)
- vi (Clytie Siddall)

------------------------------------------------------------------------------
gnome-control-center 2.13.92

background:
- Re-added instant apply (Rodney Dawes)

default applications:
- Fixed compilation warnings (Luca Cavalli)

settings daemon:
- Only start esd when not running (Rodrigo Moya)

other:
- Removed HAL dependency added by mistake (Rodrigo Moya)
- Depend on glib >= 2.8.0 (Rodrigo Moya)
- Depend on gtk+ >= 2.8.12 for Cairo speed workaround (Rodney Dawes)

updated translations:
- ca (Josep Puigdemont i Casamajó)
- da (Ole Laursen)
- de (Hendrik Richter)
- fi (Ilkka Tuohela)
- gl (Ignacio Casal Quinteiro)
- lt (Zygimantas Berucka)
- nb (Kjartan Maraas)
- nl (Vincent van Adrighem)
- no (Kjartan Maraas)
- th (Theppitak Karoonboonyanan)
- zh_CN (Funda Wang)

------------------------------------------------------------------------------
gnome-control-center 2.13.91

build:
- enable generation of Makefile for spanish docs to fix the build.

------------------------------------------------------------------------------
gnome-control-center 2.13.90

about-me:
- Preserve tab navigation on the dialog (Diego González) (317468)
- Fixed crash (Diego González) (317315)

background:
- Added apply button (Rodney Dawes) (327335)
- Fixed glib CRITICAL warnings (Rodney Dawes) (327327)

default applications:
- Fixed Thunderbird command line parameters (Luca Cavalli) (326808)
- Update custom command entries also when predefined app is selected
  (Luca Cavalli) (327749)
- Don't set entries' sensitivity, just disable input on them (Rodrigo
  Moya)
- Use better description and arguments for Epiphany (chpe) (327220)

fontilus:
- Added button for document font (Christian Persch) (160454)
- Changed "monospace" to "fixed width" (Christian Persch)
- Fixed font thumbnailing endianness (Ed Catmur) (329043)

keybindings:
- Refuse to bind letter keys without a modifier (Bastien Nocera) (86956)
- Readded the keysim/keycode binding code (Rodrigo Moya)

keyboard:
- Fixed user-visible strings (Rodrigo Moya) (328748)

mouse:
- Fixed a11y problem with gnopernicus screen reader (Anilkumar Bacheli)
  (154769)

network:
- Fixed mnemonic (Crispin Flowerday) (328884)

sound:
- Use correct stock icon for PLAY button (Dennis Cranston)
- Reduced size of the dialog (Rodrigo Moya)
- Fixed compilation warnings (Damien Carbery, Jens Granseuer) (328255)

settings daemon:
- Use verbs for slow/sticky keys dialogs, rather than OK/Cancel (chpe)
  (325686)

help:
- Updated scrollkeeper description (Alessandro Ferrucci) (327784)

other:
- Don't use "capplet" in user-visible strings (Rodrigo Moya) (168790)
- Fixed glib CRITICAL warnings (Thomas Wood)
- Added GTK category to .desktop files (Luca Cavalli) (328028)
- Use "mouse pointer" instead of "cursor" in user-visible strings
  (Scott Bronson) (318056)

updated translations:
- bg (Alexander Shopov)
- ca (Josep Puigdemont i Casamajó)
- da (Lasse Bang Mikkelsen)
- el (Kostas Papadimas)
- en_CA (Adam Weinberger)
- es (Francisco Javier F. Serrador)
- fi (Ilkka Tuohela)
- gl (Ignacio Casal Quinteiro)
- gu (Ankit Patel)
- hu (Gabor Kelemen)
- it (Luca Ferretti)
- ja (Takeshi AIHANA)
- lt (Zygimantas Berucka)
- nb (Kjartan Maraas)
- nl (Vincent van Adrighem)
- no (Kjartan Maraas)
- pt_BR (Evandro Fernandes Giovanini)
- ru (Nickolay V. Shmyrev)
- sr (Slobodan D. Sredojevic)
- sr@Latn (Slobodan D. Sredojevic)
- th (Theppitak Karoonboonyanan)
- vi (Clytie Siddall)
- zh_CN (Funda Wang)

------------------------------------------------------------------------------
gnome-control-center 2.13.5.1

default applications:
- Fixed loading of translations from XML file (Luca Cavalli)

settings daemon:
- Use g_mkdir_with_parents instead of creating all the hierarchy by hand
  (Rodrigo Moya)

other:
- Fixed m4 directory missing (chpe)

updated translations:
- da (Lasse Bang Mikkelsen)
- en_CA (Adam Weinberger)
- gu (Ankit Patel)
- sr (Slobodan D. Sredojevic)

------------------------------------------------------------------------------
gnome-control-center 2.13.5

background:
- Changed main dialog to use explicit apply with OK and cancel buttons
  (Rodney Dawes)
- Added zoom to scale type options (Alan Swanson)

default applications:
- New UI (Luca Cavalli)
- Build and general fixes to the new UI (Sebastian Bacher, Rodrigo Moya)

keybindings:
- Dropped the keysim/keycode binding code (Bastien Nocera) (133815)

keyboard:
- Made window a bit larger (Sergey Udaltsov) (326137)
- Fixed window title capitalization (Sergey Udaltsov) (326275)

mouse:
- Made mouse clock work with both left/right buttons (akmal) (321255)

sound:
- New UI (Scott Reeves)
- HIG fixes to the new UI (Dennis Cranston)
- Translation fixes (Rodrigo Moya) (326635)

themus:
- Fixed usage of head command (Thomas Wood) (316800)

typing break:
- Use gdk_spawn_* functions instead of egg equivalents (Rodrigo Moya) (326141)

settings daemon:
- Cleaned up messages about pmu on powerbook (Jeroen Zwartepoorte) (132655)
- Set Net/FallbackIconTheme XSetting for new versions of gnome-icon-theme
  and gtk+ >= 2.8.10 (Rodney Dawes) (325546)
- Use gstreamer0.10 optionally (Saleem Abdulrasool and Tim-Philip Muller) (326257)

updated translations:
- bg (Alexander Shopov)
- ca (Josep Puigdemont i Casamajó)
- en_CA (Adam Weinberger)
- es (Francisco Javier F. Serrador)
- fi (Ilkka Tuohela)
- gl (Ignacio Casal Quinteiro)
- gu (Ankit Patel)
- hu (Gabor Kelemen)
- ja (Takeshi AIHANA)
- nb (Kjartan Maraas)
- nl (Vincent van Adrighem)
- no (Kjartan Maraas)
- sr (Slobodan D. Sredojevic)
- sr@Latn (Slobodan D. Sredojevic)
- th (Theppitak Karoonboonyanan)
- vi (Clytie Siddall)
- zh_HK (Chao-Hsiung Liao)
- zh_TW (Chao-Hsiung Liao)

------------------------------------------------------------------------------
gnome-control-center 2.13.4

default-applications:
- Added Opera to list of default browsers (pholie) (324629)

keyboard:
- Fixed leak on GtkSizeGroup's (Jaap A. Haitsma) (321549)

themus:
- Update the background for metathemes that provide a preferred
  background (Guillaume Desmottes) (147665)
- Fixed typeahead searching in themes list (David Seseño)

windows behavior:
- Fixed mnemonics (Rajan Singh)

settings daemon:
- Restore prelight/active/mouse-over feedback for Tk (jenglish) (130299)
- Made Emacs xsettings mimic better GNOME's look & feel (Lukasz Stelmach)
  (320727)

other:
- Compilation fixes (Jens Granseuer) (321779)
- Removed unused --enable-gconf-source option (Mark McLoughlin)

updated translations:
- ca (Josep Puigdemont i Casamajó)
- fi (Ilkka Tuohela)
- vi (Clytie Siddall)

------------------------------------------------------------------------------
gnome-control-center 2.13.3

about-me:
- Added a preview to the filechooser used for selecting an image (Mathias Clasen)
- Fixed for running in systems with no forkpty (Brian Cameron)

gnome-settings-daemon:
- Added definition of "Gtk/ShowInputMethodMenu"/"Gtk/ShowUnicodeMenu" xsettings
  (Mathias Clasen) (319634)
- C89 compilation fixes (Jens Granseuer) (321778)
- Don't grab keyboard when getting invalid keycodes from GConf (Philippe
  Troin) (323690)

keyboard:
- Small changes in plugin API (Sergey V. Udaltsov)

themus:
- Added removal of themes from the theme selection applet (David Seseño)

typing-break:
- Don't display a dialog when the monitor is already running (Richard Hult) (307425)
- Use stock icons from GTK rather than libgnomeui (Richard Hult) (171664)

other:
- Compilation fixes (Kjartan Maraas)

translations:
- bg (Alexander Shopov)
- cs (Miloslav Trmac)
- en_CA (Adam Weinberger)
- es (Francisco Javier F. Serrador)
- et (Priit Laes)
- gl (Ignacio Casal Quinteiro)
- gu (Ankit Patel)
- ja (Takeshi AIHANA)
- lt (Zygimantas Beruèka)
- nb (Kjartan Maraas)
- no (Kjartan Maraas)
- pt_BR (Guilherme de S. Pastore)
- sk (Marcel Telka)
- sq (Laurent Dhima)
- th (Theppitak Karoonboonyanan)
- zh_CN (Funda Wang)

------------------------------------------------------------------------------
gnome-control-center 2.13.2

background:
- Sanity check on GConf string values (Alexis Robert) (320647)

themus:
- 15-20% speedup in theme thumbnailer startup (Sebastien Bacher)

shell:
- Respond correctly to theme changes (Carlos Garnacho)

other:
- Compilation fixes (Kjartan Maraas, Rodrigo Moya)

translations:
- bg (Alexander Shopov)
- cs (Miroslav Trmac)
- en_CA (Adam Weinberger)
- es (Francisco Javier F. Serrador)
- eu (Iñaki Larrañaga)
- fa (Roozbeh Pournader)
- fi (Ilkka Tuohela)
- ja (Takeshi AIHANA)
- lt (Zygimantas Berucka )
- nl (Vincent van Adrighem)
- ro (Dan Damian)
- sk (Marcel Telka)
- th (Theppitak Karoonboonyanan)

------------------------------------------------------------------------------
gnome-control-center 2.13.1

default-applications:
- Add Sylpheed-Claws to the list of possible mailers (Colin Leroy)

mouse:
- gcc 2.95 compilation fixes (Jens Granseuer) (318746)

themus:
- Allow installation of themes with file:// URIs (Ed Catmur) (319358)

shell:
- Only show one screensaver capplet when both xscreensaver and gnome-screensaver
  are installed (Rodrigo Moya) (315505)
- Fix scrollbar arrows (Carlos Garnacho)
- Calculate text widths instead of forcing them (Carlos Garnacho) (319492)
- Force canvas background to base[GTK_STATE_NORMAL] and remove the need to
  repaint the background, in white (Carlos Garnacho)

typing-break:
- Fix weird spacing between systray icons (Rodrigo Moya) (318231)

other:
- Add schema for remembering NumLock state between sessions (Jürg Billeter)
  (74215)
- Add check for xinput extension (Ray Strode) (314409)
- Update the desktop font in addition to the application font when
  'apply font' in large print themes is selected (Muktha) (123551)
- Reduced amount of xrdb executions (Erwann Chenede) (314774)
- Don't block settings daemon while executing children processes (Rodrigo Moya)
- Lazy load the screensaver and the typing break monitor (Rodrigo Moya)
- Share a single GConfClient in the settings daemon (Rodrigo Moya)
- Execute xrdb with -nocpp switch when possible (Rodrigo Moya)
- Swap buttons on auxiliary mice for left-handed mode (Ray Strode) (314409)

translations:
- bg (Alexander Shopov)
- en_CA (Adam Weinberger)
- et (Priit Laes)
- fi (Ilkka Tuohela)
- pt_BR (Guilherme de S. Pastore)
- sv (Christian Rose)

4 files changed, 21 insertions, 35 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 7573d4b8e3e..3543e0234c6 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.59 2006/03/21 06:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.60 2006/03/30 21:14:58 jmmv Exp $
 #
 
-DISTNAME=	control-center-2.12.1
+DISTNAME=	control-center-2.14.0
 PKGNAME=	gnome2-${DISTNAME}
-PKGREVISION=	7
 CATEGORIES=	x11 gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.12/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/control-center/2.14/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -16,12 +15,13 @@ BUILD_USES_MSGFMT=	yes
 
 USE_MSGFMT_PLURALS=	yes
 GNU_CONFIGURE=		yes
-USE_DIRS+=		gnome2-1.5
+USE_DIRS+=		gnome2-1.6
 USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		gmake pkg-config
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-alsa
+CONFIGURE_ARGS+=	--with-gstreamer=0.10
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 
 INSTALL_MAKE_FLAGS+=	vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE}
@@ -43,6 +43,7 @@ CONF_FILES+=		${EGDIR}/font-method.conf \
 			${PKG_SYSCONFDIR}/font-method.conf
 
 BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
+BUILDLINK_DEPENDS.gtk2+=	gtk2>=2.8.12
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
@@ -56,7 +57,8 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/gst-plugins0.8/buildlink3.mk"
+.include "../../multimedia/gstreamer0.10/buildlink3.mk"
+.include "../../multimedia/gst-plugins0.10-base/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../sysutils/desktop-file-utils/desktopdb.mk"
 .include "../../sysutils/gnome-menus/buildlink3.mk"
@@ -64,6 +66,7 @@ BUILDLINK_DEPENDS.glib2+=	glib2>=2.6.0
 .include "../../sysutils/nautilus/buildlink3.mk"
 .include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../wm/metacity/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
diff --git a/x11/gnome2-control-center/PLIST b/x11/gnome2-control-center/PLIST
index 43a3b14f449..bc115a7e543 100644
--- a/x11/gnome2-control-center/PLIST
+++ b/x11/gnome2-control-center/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2005/10/12 21:55:02 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.18 2006/03/30 21:14:58 jmmv Exp $
 bin/gnome-accessibility-keyboard-properties
 bin/gnome-at-properties
 bin/gnome-background-properties
@@ -116,6 +116,7 @@ share/gconf/schemas/desktop_gnome_font_rendering.schemas
 share/gconf/schemas/desktop_gnome_peripherals_keyboard_xkb.schemas
 share/gconf/schemas/fontilus.schemas
 share/gconf/schemas/themus.schemas
+share/gnome-default-applications/gnome-default-applications.xml
 share/gnome/cursor-fonts/cursor-large-white.pcf
 share/gnome/cursor-fonts/cursor-large.pcf
 share/gnome/cursor-fonts/cursor-white.pcf
@@ -134,6 +135,7 @@ share/gnome/help/control-center/C/config-screensaver.xml
 share/gnome/help/control-center/C/config-sound.xml
 share/gnome/help/control-center/C/config-themes.xml
 share/gnome/help/control-center/C/control-center.xml
+share/gnome/help/control-center/es/control-center.xml
 share/gnome/vfolders/font-method.directory
 share/gnome/vfolders/theme-method.directory
 share/icons/hicolor/48x48/apps/gnome-control-center.png
@@ -208,9 +210,11 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/xh/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/control-center-2.0.mo
+${PKGLOCALEDIR}/locale/zh_HK/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/control-center-2.0.mo
 ${PKGLOCALEDIR}/locale/zu/LC_MESSAGES/control-center-2.0.mo
 share/omf/control-center/control-center-C.omf
+share/omf/control-center/control-center-es.omf
 share/pixmaps/display-capplet.png
 @comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/control-center
@@ -218,10 +222,12 @@ share/pixmaps/display-capplet.png
 @comment in ORBit2: @dirrm share/idl
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
 @dirrm share/gnome/vfolders
+@dirrm share/gnome/help/control-center/es
 @dirrm share/gnome/help/control-center/C
 @dirrm share/gnome/help/control-center
 @comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/gnome/cursor-fonts
+@comment in gnome2-dirs: @dirrm share/gnome-default-applications
 @comment in gnome2-dirs: @dirrm share/gnome
 @comment in GConf2: @dirrm share/gconf/schemas
 @dirrm share/examples/gnome2-control-center
@@ -229,6 +235,7 @@ share/pixmaps/display-capplet.png
 @dirrm share/control-center-2.0/pixmaps
 @dirrm share/control-center-2.0/interfaces
 @comment in gnome2-dirs: @dirrm share/control-center-2.0/icons
+@comment in gnome2-dirs: @dirrm share/control-center-2.0/capplets
 @comment in gnome2-dirs: @dirrm share/control-center-2.0
 @comment in xdg-dirs: @dirrm share/applications
 @dirrm lib/window-manager-settings
diff --git a/x11/gnome2-control-center/distinfo b/x11/gnome2-control-center/distinfo
index 867385a432d..218a90900b6 100644
--- a/x11/gnome2-control-center/distinfo
+++ b/x11/gnome2-control-center/distinfo
@@ -1,9 +1,8 @@
-$NetBSD: distinfo,v 1.24 2005/12/19 00:20:35 rillig Exp $
+$NetBSD: distinfo,v 1.25 2006/03/30 21:14:58 jmmv Exp $
 
-SHA1 (control-center-2.12.1.tar.bz2) = fc648f7535eb01da64c1c47d9bef420b1c9b0927
-RMD160 (control-center-2.12.1.tar.bz2) = 297369394c20b453aea1345d389a731328f8c611
-Size (control-center-2.12.1.tar.bz2) = 1771524 bytes
+SHA1 (control-center-2.14.0.tar.bz2) = 2690b0ce1c86758658d1b1b4ccbebb9d97dbe890
+RMD160 (control-center-2.14.0.tar.bz2) = 2cd440506cc9c6e9857f43b2cdca283ee35f8ab9
+Size (control-center-2.14.0.tar.bz2) = 1833331 bytes
 SHA1 (patch-aa) = 826bd6ef91135a61a86450ff150662156c833ae8
 SHA1 (patch-ad) = 15aeffd62733036840d402f1ed3a2f1a89c8945d
 SHA1 (patch-af) = 50f179c3d2775f0a058d7644f6f9a0b958f4b531
-SHA1 (patch-ag) = 752abc7987b398d35ab3b07191b131c4b9bf1b07
diff --git a/x11/gnome2-control-center/patches/patch-ag b/x11/gnome2-control-center/patches/patch-ag
deleted file mode 100644
index 8320dc9177a..00000000000
--- a/x11/gnome2-control-center/patches/patch-ag
+++ /dev/null
@@ -1,23 +0,0 @@
-$NetBSD: patch-ag,v 1.1 2005/12/19 00:20:35 rillig Exp $
-
-Keywords: c90
-
---- capplets/mouse/gnome-mouse-properties.c.orig	Fri Sep 16 14:43:01 2005
-+++ capplets/mouse/gnome-mouse-properties.c	Mon Dec 19 01:09:51 2005
-@@ -665,6 +665,7 @@ populate_tree_model(GtkTreeModelSort* mo
- 
- 	gchar **iterator = NULL;
- 	gchar **paths = NULL;
-+	const gchar *xpaths;
- 
- 	GConfClient* client = gconf_client_get_default();
- 	GtkListStore* store = GTK_LIST_STORE(gtk_tree_model_sort_get_model(model));
-@@ -673,7 +674,7 @@ populate_tree_model(GtkTreeModelSort* mo
- 	g_object_unref(client);
- 	client = NULL;
- 
--	const gchar *xpaths = g_getenv ("XCURSOR_PATH");
-+	xpaths = g_getenv ("XCURSOR_PATH");
- 
- 	if (xpaths != NULL) {
- 		paths = g_strsplit (xpaths, ":", 0);