rpms/xchat-gnome/devel xchat-gnome-0.17-config.patch, NONE, 1.1 xchat-gnome.spec, 1.34, 1.35 xchat-gnome-config.patch, 1.8, NONE

[Brian Pepple (bpepple)]

Author: bpepple

Update of /cvs/extras/rpms/xchat-gnome/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11790

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-0.17-config.patch 
Removed Files:
	xchat-gnome-config.patch 
Log Message:
* Mon Apr  2 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.17-2
- D'Oh!  Forgot to add the new config patch.


xchat-gnome-0.17-config.patch:

--- NEW FILE xchat-gnome-0.17-config.patch ---
diff -ur xchat-gnome-0.17.OLD/plugins/perl/perl.c xchat-gnome-0.17/plugins/perl/perl.c
--- xchat-gnome-0.17.OLD/plugins/perl/perl.c	2007-03-06 17:47:26.000000000 -0500
+++ xchat-gnome-0.17/plugins/perl/perl.c	2007-04-02 08:40:39.000000000 -0400
@@ -92,7 +92,7 @@
 	if (!xdir)						  /* xchatdirfs is new for 2.0.9, will fail on older */
 		xdir = xchat_get_info (ph, "xchatdir");
 
-	/* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
+	/* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
 	perl_auto_load_from_path (xdir);
 
 #ifdef WIN32
diff -ur xchat-gnome-0.17.OLD/plugins/python/python.c xchat-gnome-0.17/plugins/python/python.c
--- xchat-gnome-0.17.OLD/plugins/python/python.c	2007-03-06 17:47:26.000000000 -0500
+++ xchat-gnome-0.17/plugins/python/python.c	2007-04-02 08:41:13.000000000 -0400
@@ -412,7 +412,7 @@
 		return expanded;
 	g_free(expanded);
 
-	/* Check if ~/.xchat2/<filename> exists. */
+	/* Check if ~/.xchat-gnome/<filename> exists. */
 	expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
 				    filename, NULL);
 	if (g_file_test(expanded, G_FILE_TEST_EXISTS))
diff -ur xchat-gnome-0.17.OLD/src/common/cfgfiles.c xchat-gnome-0.17/src/common/cfgfiles.c
--- xchat-gnome-0.17.OLD/src/common/cfgfiles.c	2007-03-17 21:40:09.000000000 -0400
+++ xchat-gnome-0.17/src/common/cfgfiles.c	2007-04-02 08:39:50.000000000 -0400
@@ -34,7 +34,7 @@
 #ifdef WIN32
 #define XCHAT_DIR "X-Chat 2"
 #else
-#define XCHAT_DIR ".xchat2"
+#define XCHAT_DIR ".xchat-gnome"
 #endif
 #define DEF_FONT "Monospace 9"
 
@@ -352,7 +352,7 @@
 #else
 		if (mkdir (dir, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
 #endif
-			fe_message (_("Cannot create ~/.xchat2"), FE_MSG_ERROR);
+			fe_message (_("Cannot create ~/.xchat-gnome"), FE_MSG_ERROR);
 	}
 }
 
diff -ur xchat-gnome-0.17.OLD/src/common/fe.h xchat-gnome-0.17/src/common/fe.h
--- xchat-gnome-0.17.OLD/src/common/fe.h	2007-03-06 17:47:37.000000000 -0500
+++ xchat-gnome-0.17/src/common/fe.h	2007-04-02 08:40:15.000000000 -0400
@@ -106,7 +106,7 @@
 void fe_get_int (char *prompt, int def, void *callback, void *ud);
 #define FRF_WRITE 1	/* save file */
 #define FRF_MULTIPLE 2	/* multi-select */
-#define FRF_ADDFOLDER 4	/* add ~/.xchat2 to favourites */
+#define FRF_ADDFOLDER 4	/* add ~/.xchat-gnome to favourites */
 #define FRF_CHOOSEFOLDER 8	/* choosing a folder only */
 #define FRF_FILTERISINITIAL 16	/* unused */
 #define FRF_NOASKOVERWRITE 32	/* don't ask to overwrite existing files */
diff -ur xchat-gnome-0.17.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.17/src/fe-gnome/preferences-page-plugins.c
--- xchat-gnome-0.17.OLD/src/fe-gnome/preferences-page-plugins.c	2007-03-31 07:07:34.000000000 -0400
+++ xchat-gnome-0.17/src/fe-gnome/preferences-page-plugins.c	2007-04-02 08:39:21.000000000 -0400
@@ -240,7 +240,7 @@
 	file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
 
 	homedir = g_get_home_dir();
-	plugindir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
+	plugindir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
 	gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
 	g_free (plugindir);
 
@@ -434,7 +434,7 @@
 	xchat_plugin *plugin;
 
 	homedir = g_get_home_dir ();
-	xchatdir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
+	xchatdir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
 	for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
 	for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
 	for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add);


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/extras/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- xchat-gnome.spec	2 Apr 2007 13:34:57 -0000	1.34
+++ xchat-gnome.spec	2 Apr 2007 13:37:35 -0000	1.35
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.17
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -127,6 +127,9 @@
 
 
 %changelog
+* Mon Apr  2 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.17-2
+- D'Oh!  Forgot to add the new config patch.
+
 * Mon Apr  2 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.17-1
 - Update to 0.17 (bugfix release).
 - Update the config patch.


--- xchat-gnome-config.patch DELETED ---