r13749 - in /packages/unstable/xchat-gnome/debian: changelog patches/80_fix_languages_selection.patch patches/81_no_translation_informations_in_query.patch patches/90_from_svn_fix_away_back_command.patch
nobse at users.alioth.debian.org
nobse at users.alioth.debian.org
Wed Dec 5 00:07:04 UTC 2007
Author: nobse
Date: Wed Dec 5 00:07:04 2007
New Revision: 13749
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=13749
Log:
Add useful patches from Ubuntu.
Added:
packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch
packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch
packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch
Modified:
packages/unstable/xchat-gnome/debian/changelog
Modified: packages/unstable/xchat-gnome/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/changelog?rev=13749&op=diff
==============================================================================
--- packages/unstable/xchat-gnome/debian/changelog (original)
+++ packages/unstable/xchat-gnome/debian/changelog Wed Dec 5 00:07:04 2007
@@ -1,3 +1,15 @@
+xchat-gnome (1:0.18-2) unstable; urgency=low
+
+ * All patches in this release were taken from the Ubuntu package.
+ * debian/patches/80_fix_languages_selection.patch:
+ - correctly update the languages list when selecting one
+ * debian/patches/81_no_translation_informations_in_query.patch:
+ - don't display translation informations when a query tab is opened
+ * debian/patches/90_from_svn_fix_away_back_command.patch:
+ - patch from SVN, returning from away should use the back command
+
+ -- Norbert Tretkowski <nobse at debian.org> Wed, 05 Dec 2007 00:48:49 +0100
+
xchat-gnome (1:0.18-1) unstable; urgency=low
* New upstream release.
Added: packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch?rev=13749&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/80_fix_languages_selection.patch Wed Dec 5 00:07:04 2007
@@ -1,0 +1,13 @@
+Index: src/fe-gnome/preferences-page-spellcheck.c
+===================================================================
+--- src/fe-gnome/preferences-page-spellcheck.c (révision 2576)
++++ src/fe-gnome/preferences-page-spellcheck.c (copie de travail)
+@@ -153,7 +153,7 @@
+ COL_LANG_CODE, &lang, -1);
+ active = sexy_spell_entry_language_is_active (SEXY_SPELL_ENTRY (gui.text_entry), lang);
+
+- gtk_list_store_set (store, &iter, COL_LANG_ACTIVATED, !active, -1);
++ gtk_list_store_set (store, &iter, COL_LANG_ACTIVATED, active, -1);
+ } while (gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter));
+ }
+ }
Added: packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch?rev=13749&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/81_no_translation_informations_in_query.patch Wed Dec 5 00:07:04 2007
@@ -1,0 +1,31 @@
+Index: src/common/text.c
+===================================================================
+--- src/common/text.c (révision 2576)
++++ src/common/text.c (copie de travail)
+@@ -1368,7 +1368,7 @@
+ free (pntevts_text[i]);
+
+ /* make-te.c sets this 128 flag (DON'T call gettext() flag) */
+- if (te[i].num_args & 128)
++ if (te[i].num_args & 128 || !strcmp (te[i].def, ""))
+ pntevts_text[i] = strdup (te[i].def);
+ else
+ pntevts_text[i] = strdup (_(te[i].def));
+@@ -1392,7 +1392,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)
++ if (te[i].num_args & 128 || !strcmp (te[i].def, ""))
+ pntevts_text[i] = strdup (te[i].def);
+ else
+ pntevts_text[i] = strdup (_(te[i].def));
+@@ -1572,7 +1572,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)
++ if (te[i].num_args & 128 || !strcmp (te[i].def, ""))
+ pntevts_text[i] = strdup (te[i].def);
+ else
+ pntevts_text[i] = strdup (_(te[i].def));
Added: packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch?rev=13749&op=file
==============================================================================
--- packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch (added)
+++ packages/unstable/xchat-gnome/debian/patches/90_from_svn_fix_away_back_command.patch Wed Dec 5 00:07:04 2007
@@ -1,0 +1,27 @@
+--- trunk/src/fe-gnome/main-window.c 2007/09/09 22:34:50 2560
++++ trunk/src/fe-gnome/main-window.c 2007/09/09 22:56:32 2561
+@@ -532,11 +532,20 @@
+ g_free (buf);
+
+ /* Away */
+- if (current_sess->server->is_away != gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (away))) {
+- if (all) {
+- handle_command (current_sess, "allserv away", FALSE);
++ gboolean away = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (away));
++ if (current_sess->server->is_away != away) {
++ if (away) {
++ if (all) {
++ handle_command (current_sess, "allserv away", FALSE);
++ } else {
++ handle_command (current_sess, "away", FALSE);
++ }
+ } else {
+- handle_command (current_sess, "away", FALSE);
++ if (all) {
++ handle_command (current_sess, "allserv back", FALSE);
++ } else {
++ handle_command (current_sess, "back", FALSE);
++ }
+ }
+ }
+ }
More information about the pkg-gnome-commits
mailing list