rpms/xchat-gnome/devel xchat-gnome-0.17-gettext.patch, NONE, 1.1 xchat-gnome.spec, 1.37, 1.38

[Brian Pepple (bpepple)]

Author: bpepple

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

Modified Files:
	xchat-gnome.spec 
Added Files:
	xchat-gnome-0.17-gettext.patch 
Log Message:
* Mon May 28 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.17-5
- Add gettext patch so we don't print translation information when open a query window.


xchat-gnome-0.17-gettext.patch:

--- NEW FILE xchat-gnome-0.17-gettext.patch ---
--- src/common/text.c.orig	2007-03-29 22:44:16.000000000 +0000
+++ src/common/text.c	2007-03-29 22:45:25.000000000 +0000
@@ -1117,7 +1117,7 @@
 			free (pntevts_text[i]);
 
 		/* make-te.c sets this 128 flag (DON'T call gettext() flag) */
-		if (te[i].num_args & 128 || strcmp (_(te[i].def), ""))
+		if (te[i].num_args & 128 || strcmp (te[i].def, "") == 0)
 			pntevts_text[i] = strdup (te[i].def);
 		else
 			pntevts_text[i] = strdup (_(te[i].def));
@@ -1141,7 +1141,7 @@
 			fe_message (out, FE_MSG_WARN);
 			free (pntevts_text[i]);
 			/* make-te.c sets this 128 flag (DON'T call gettext() flag) */
-			if (te[i].num_args & 128 || strcmp (_(te[i].def), ""))
+			if (te[i].num_args & 128 || strcmp (te[i].def, "") == 0)
 				pntevts_text[i] = strdup (te[i].def);
 			else
 				pntevts_text[i] = strdup (_(te[i].def));
@@ -1321,7 +1321,7 @@
 			snprintf(out, sizeof(out), "The data for event %s failed to load. Reverting to defaults.\nThis may be because a new version of XChat is loading an old config file.\n\nCheck all print event texts are correct", evtnames[i]);
 			   gtkutil_simpledialog(out); */
 			/* make-te.c sets this 128 flag (DON'T call gettext() flag) */
-			if (te[i].num_args & 128 || strcmp (_(te[i].def), ""))
+			if (te[i].num_args & 128 || strcmp (te[i].def, "") == 0)
 				pntevts_text[i] = strdup (te[i].def);
 			else
 				pntevts_text[i] = strdup (_(te[i].def));


Index: xchat-gnome.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xchat-gnome/devel/xchat-gnome.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- xchat-gnome.spec	17 Apr 2007 00:07:30 -0000	1.37
+++ xchat-gnome.spec	28 May 2007 16:03:15 -0000	1.38
@@ -1,6 +1,6 @@
 Name:           xchat-gnome
 Version:        0.17
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        GNOME front-end to xchat
 
 Group:          Applications/Internet
@@ -10,6 +10,7 @@
 Patch0:		%{name}-%{version}-config.patch
 Patch1:		%{name}-%{version}-static.patch
 Patch2:		%{name}-%{version}-setup-dialog.patch
+Patch3:		%{name}-%{version}-gettext.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	openssl-devel
@@ -46,6 +47,7 @@
 %patch0 -p1 -b .config
 %patch1 -p1 -b .static
 %patch2 -p1 -b .dialog
+%patch3 -p0 -b .gettext
 
 
 %build
@@ -131,6 +133,9 @@
 
 
 %changelog
+* Mon May 28 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.17-5
+- Add gettext patch so we don't print translation information when open a query window.
+
 * Mon Apr 16 2007 Brian Pepple <bpepple at fedoraproject.org> - 0.17-4
 - Add patch to fix setup-dialog. (#236636)