debian/0000775000000000000000000000000012270534311007166 5ustar debian/control0000664000000000000000000000466112270534451010605 0ustar # This file is autogenerated. DO NOT EDIT! # # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: xchat-gnome Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: Debian GNOME Maintainers Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xchat-gnome/ubuntu Build-Depends: debhelper (>= 5.0.0), gnome-pkg-tools, autotools-dev, cdbs (>= 0.4.41), gnome-common, dh-autoreconf, autopoint, intltool (>= 0.40.0), libcanberra-gtk-dev (>= 0.3), libgtk2.0-dev (>= 2.24.0), libgconf2-dev (>= 2.8.0), libxft-dev, libperl-dev, python-dev, tcl-dev, libdbus-glib-1-dev (>= 0.60), libtool, libgnutls-dev, libnotify-dev (>= 0.7), libsexy-dev (>= 0.1.11), gnome-doc-utils, docbook-xml, libssl-dev, dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.18.0), libsm-dev (>= 2:1.0.0), libice-dev Standards-Version: 3.8.3 Package: xchat-gnome Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, xchat-gnome-common (= ${source:Version}) Replaces: xchat-gnome-common (<< 1:0.30.0~git20100421.29cc76) Recommends: xchat-gnome-indicator Description: simple and featureful IRC client for GNOME XChat-GNOME is an IRC chat program, based on the popular X-Chat IRC client, designed with an emphasis on simplicity. It allows you to join multiple IRC channels (chat rooms) at the same time, talk publicly, private one-on-one conversations and much more. Package: xchat-gnome-common Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} Description: data files for XChat-GNOME XChat-GNOME is an IRC chat program, based on the popular X-Chat IRC client, designed with an emphasis on simplicity. It allows you to join multiple IRC channels (chat rooms) at the same time, talk publicly, private one-on-one conversations and much more. . This package contains the arch-independent files. debian/control.in0000664000000000000000000000431412256661170011210 0ustar Source: xchat-gnome Section: gnome Priority: optional Maintainer: Ubuntu Desktop Team XSBC-Original-Maintainer: Debian GNOME Maintainers Uploaders: @GNOME_TEAM@ Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/xchat-gnome/ubuntu Build-Depends: debhelper (>= 5.0.0), gnome-pkg-tools, autotools-dev, cdbs (>= 0.4.41), gnome-common, dh-autoreconf, autopoint, intltool (>= 0.40.0), libcanberra-gtk-dev (>= 0.3), libgtk2.0-dev (>= 2.24.0), libgconf2-dev (>= 2.8.0), libxft-dev, libperl-dev, python-dev, tcl-dev, libdbus-glib-1-dev (>= 0.60), libtool, libgnutls-dev, libnotify-dev (>= 0.7), libsexy-dev (>= 0.1.11), gnome-doc-utils, docbook-xml, libssl-dev, dpkg-dev (>= 1.13.19), libglib2.0-dev (>= 2.18.0), libsm-dev (>= 2:1.0.0), libice-dev Standards-Version: 3.8.3 Package: xchat-gnome Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, xchat-gnome-common (= ${source:Version}) Replaces: xchat-gnome-common (<< 1:0.30.0~git20100421.29cc76) Recommends: xchat-gnome-indicator Description: simple and featureful IRC client for GNOME XChat-GNOME is an IRC chat program, based on the popular X-Chat IRC client, designed with an emphasis on simplicity. It allows you to join multiple IRC channels (chat rooms) at the same time, talk publicly, private one-on-one conversations and much more. Package: xchat-gnome-common Architecture: all Depends: ${shlibs:Depends}, ${misc:Depends} Description: data files for XChat-GNOME XChat-GNOME is an IRC chat program, based on the popular X-Chat IRC client, designed with an emphasis on simplicity. It allows you to join multiple IRC channels (chat rooms) at the same time, talk publicly, private one-on-one conversations and much more. . This package contains the arch-independent files. debian/xchat-gnome-common.install0000664000000000000000000000004411770727100014260 0ustar debian/tmp/etc debian/tmp/usr/share debian/changelog0000664000000000000000000011100212270534311011033 0ustar xchat-gnome (1:0.30.0~git20131003.d20b8d+really20110821-0.2ubuntu12) trusty; urgency=medium * Revert to previous version until issues are resolved (see lp 1272455 for details). - simplified previous version number due to length -- Marc Deslauriers Fri, 24 Jan 2014 13:27:08 -0500 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu12) trusty; urgency=medium * No-change rebuild for Tcl 8.6. -- Matthias Klose Thu, 02 Jan 2014 20:26:36 +0100 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu11) trusty; urgency=medium * Use dh-autoreconf & force update (acient) intltool. -- Dimitri John Ledkov Wed, 25 Dec 2013 22:59:05 +0000 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu10) trusty; urgency=low * Rebuild for Perl 5.18. -- Colin Watson Mon, 21 Oct 2013 13:47:08 +0100 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu9) saucy; urgency=low * define_functions_fix_build.patch: - fix build due to missing prototype warnings -- Sebastien Bacher Thu, 20 Jun 2013 17:20:00 +0200 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu8) raring; urgency=low * Build using Tcl 8.5. LP: #1155269. * Fix build failure, not linking gmodule. -- Matthias Klose Thu, 14 Mar 2013 13:58:35 -0700 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu7) quantal; urgency=low * debian/patches/120-fix-clipboard-segfault.patch: Don't set the CLIPBOARD buffer when selecting text. CLIPBOARD should only be used when specifically selecting copy from a context menu. This may also have the side effect of fixing the common but hard to reproduce clipboard segfault. (LP: #844003) -- Marc Deslauriers Tue, 21 Aug 2012 11:58:38 -0400 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu6) quantal; urgency=low * debian/patches/00git_remember_window_maximise.patch - Correctly restore maximized window state (LP: #1016292) -- Robert Ancell Fri, 22 Jun 2012 11:03:55 +1200 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu5) quantal; urgency=low * debian/control: - Use standards version 3.9.3 - Drop dependency on liblaunchpad-integration-dev * debian/patches/02_lpi.patch: - Dropped, we no longer do Launchpad integration -- Robert Ancell Tue, 15 May 2012 09:56:42 +1200 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu4) precise; urgency=low * debian/patches/119-fix-null-channel-list-window.patch: fix "(null)" server name in channel list window. (LP: #903025) -- Marc Deslauriers Mon, 12 Dec 2011 22:49:38 -0500 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu3) precise; urgency=low * No-change rebuild to drop spurious libsfgcc1 dependency on armhf. -- Adam Conrad Fri, 02 Dec 2011 17:31:20 -0700 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu2) precise; urgency=low * Rebuild for Perl 5.14. -- Colin Watson Tue, 15 Nov 2011 23:40:04 +0000 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2ubuntu1) precise; urgency=low * Merge with Debian testing, remaining changes: - debian/control: - add Build-Depends on liblaunchpad-integration-dev. - Recommend xchat-gnome-indicator to get Unity integration - add Replaces: to xchat-gnome for xchat-gnome-common, due to the move of xchat-gnome.desktop - remove duplicate entry in Build-Depends for intltool. - debian/xchat-gnome.gconf-defaults: Set the default enabled plugins, indicator, netmonitor, and notifyosd. - debian/xchat-gnome.install: also install the xchat-gnome.desktop file from /usr/share/applications in xchat-gnome rather than xchat-gnome-common. - debian/rules: update the xchat-gnome-common binary-install target to not keep a duplicate copy of the xchat-gnome.desktop file. - debian/patches/02_lpi.patch: add Launchpad integration items to the help menu - debian/patches/04_autojoin_ubuntu_chan.patch: add the Ubuntu network as default selection and default to autojoining #ubuntu. - debian/patches/20_add_gui_focus.patch: implement GUI focus from XChat. - debian/patches/51_freenode_default_port_8001.patch: Drop ports 666x for FreeNode to workaround a possible DCC exploit. - debian/patches/95_apturl-support.patch: support apt://-urls. - debian/patches/10_xchat-gnome-close-event.patch: add events for window close. - debian/patches/100-Zero-out-passwords-upon-exit.patch: Cherrypicked from xchat tree - debian/patches/101-Sync-in-servers-from-xchat.patch: From xchat upstream - debian/patches/102-Drop-IPV6-servers.patch: Cherrypicked from xchat tree (LP: #127616) - debian/patches/103-Add-chillfactory-irc-servers.patch: From xchat Debian - debian/patches/104-Don-t-crash-if-servlist-is-undefined.patch: Cherrypicked from xchat tree - debian/patches/105-Use-u-instead-of-s.patch: Cherrypicked from xchat tree - debian/patches/106-ensure-an-empty-string-at-index-32-for-cmd_deop-etc.patch: Cherrypicked from xchat tree - debian/patches/107-fix-permissions-on-creating-files.patch: Cherrypicked from xchat tree - debian/patches/108-userlist-default-width.patch: make sure the userlist in the main window has a reasonable width by default. - debian/patches/109-use-scrollback-timestamps.patch: use actual timestamps when loading scrollback files. - debian/patches/110-fix-fd-leak.patch: fix a file handle leak. - debian/patches/111-increase-channel-limit.patch: port code from xchat to remove the limitation on the number of autojoin channels. - debian/patches/115-fix-network-editor.patch: Fix network editor in preferences. - debian/patches/116-remove-amiganet.patch: Remove defunct irc network. - debian/patches/117-fix-net-monitor-segfault.patch: fix segfault in the net monitor plugin. - debian/patches/118-fix-net-monitor-reconnect.patch: correctly reconnect after suspend and resume. * Dropped patches: - debian/patches/53_new_nm_api.patch: upstream - debian/patches/52_no_zero_width_pixmaps.patch: upstream - debian/patches/112-fix-empty-connect-dialog.patch: upstream - debian/patches/113-correctly-free-items.patch: upstream - debian/patches/114-fix-background-pixmap-depth.patch: upstream -- Marc Deslauriers Sun, 13 Nov 2011 16:24:45 -0500 xchat-gnome (1:0.30.0~git20110821.e2a400-0.2) unstable; urgency=high * Non-maintainer upload. * Urgency still high, for RC bug fix in previous upload. * Really bump libnotify-dev B-Dep version. -- Theppitak Karoonboonyanan Thu, 25 Aug 2011 00:11:23 +0700 xchat-gnome (1:0.30.0~git20110821.e2a400-0.1) unstable; urgency=high * Non-maintainer upload. * New upstream git snapshot. + Fix empty & non-functional connect & dcc dialogs Closes: #627711. + Urgency high to fix long-lasting RC bug in testing. * Drop all patches according to new upstream: + 01_link_libice.patch: merged upstream. + 02_libnotify_compat.patch: no longer needed. + 03_dcc_window.patch: fixed differently upstream. * Bump libnotify-dev B-Dep to (>= 0.7) as required by new upstream. -- Theppitak Karoonboonyanan Sun, 21 Aug 2011 11:15:21 +0700 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu8) oneiric; urgency=low * debian/patches/117-fix-net-monitor-segfault.patch: fix segfault in the net monitor plugin. (LP: #851058) * debian/patches/118-fix-net-monitor-reconnect.patch: correctly reconnect after suspend and resume. (LP: #855853) -- Marc Deslauriers Sat, 24 Sep 2011 12:31:58 -0400 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu7) oneiric; urgency=low * debian/patches/115-fix-network-editor.patch: Fix network editor in preferences. (LP: #830756, LP: #811062) * debian/patches/116-remove-amiganet.patch: Remove defunct irc network. (LP: #848750) -- Marc Deslauriers Wed, 14 Sep 2011 06:01:39 -0400 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu6) oneiric; urgency=low * debian/patches/111-increase-channel-limit.patch: port code from xchat to remove the limitation on the number of autojoin channels. (LP: #751925) * debian/patches/112-fix-empty-connect-dialog.patch: Fix empty connect and dcc dialogs. (LP: #842434) * debian/patches/03_dcc_window.patch: removed, superseded by 112-fix-empty-connect-dialog.patch. * debian/patches/113-correctly-free-items.patch: don't free items before passing them to g_slist_remove. * debian/patches/114-fix-background-pixmap-depth.patch: Don't hardcode background pixmap depth -- Marc Deslauriers Tue, 13 Sep 2011 09:46:12 -0400 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu5) oneiric; urgency=low * debian/patches/108-userlist-default-width.patch: make sure the userlist in the main window has a reasonable width by default. (LP: #828788) * debian/patches/109-use-scrollback-timestamps.patch: use actual timestamps when loading scrollback files. (LP: #834816) * debian/patches/110-fix-fd-leak.patch: fix a file handle leak. (LP: #829009) -- Marc Deslauriers Wed, 07 Sep 2011 14:48:47 -0400 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu4) oneiric; urgency=low * Cherrypick various fixes from xchat tree: - 100-Zero-out-passwords-upon-exit.patch - 102-Drop-IPV6-servers.patch (LP: #127616) - 104-Don-t-crash-if-servlist-is-undefined.patch - 105-Use-u-instead-of-s.patch - 106-ensure-an-empty-string-at-index-32-for-cmd_deop-etc.patch - 107-fix-permissions-on-creating-files.patch * Cherrypick irc server list updates - 101-Sync-in-servers-from-xchat.patch: From xchat upstream (LP: #398664) - 103-Add-chillfactory-irc-servers.patch: From xchat Debian -- Bryce Harrington Thu, 11 Aug 2011 17:03:31 -0700 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu3) oneiric; urgency=low * debian/patches/53_new_nm_api.patch: fix compatibility with new network manager API. * debian/patches/52_no_zero_width_pixmaps.patch: add back, as upstream fix isn't in this git snapshot. -- Marc Deslauriers Thu, 11 Aug 2011 22:07:43 -0400 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu2) oneiric; urgency=low [ Jorge Castro ] * Recommend xchat-gnome-indicator to get Unity integration (LP: #790821) [ Mathieu Trudel-Lapierre ] * debian/control: add Replaces: to xchat-gnome for xchat-gnome-common missing from the previous upload, due to the move of xchat-gnome.desktop. -- Mathieu Trudel-Lapierre Tue, 05 Jul 2011 14:58:36 -0400 xchat-gnome (1:0.30.0~git20100421.29cc76-1ubuntu1) oneiric; urgency=low * Merge with Debian unstable, remaining changes: (LP: #773847) - debian/control: - add Build-Depends on liblaunchpad-integration-dev. - xchat-gnome Suggests: xchat-gnome-indicator. - debian/patches/02_lpi.patch: add Launchpad integration items to the help menu - debian/patches/10_xchat-gnome-close-event.patch: add events for window close. - debian/patches/04_autojoin_ubuntu_chan.patch: add the Ubuntu network as default selection and default to autojoining #ubuntu. - debian/patches/20_add_gui_focus.patch: implement GUI focus from XChat. - debian/patches/51_freenode_default_port_8001.patch: Drop ports 666x for FreeNode to workaround a possible DCC exploit. - debian/patches/95_apturl-support.patch: support apt://-urls. - debian/watch: also look for unstable versions - debian/xchat-gnome.gconf-defaults: Set the default enabled plugins, indicator, netmonitor, and notifyosd. * debian/patches/52_no_zero_width_pixmaps.patch: dropped, applied upstream. * debian/patches/98_ice_depends_for_eggsmclient.patch: replaced by 01_link_libice.patch. * debian/control: remove duplicate entry in Build-Depends for intltool. * debian/xchat-gnome.install: also install the xchat-gnome.desktop file from /usr/share/applications in xchat-gnome rather than xchat-gnome-common. (LP: #374686) * debian/rules: update the xchat-gnome-common binary-install target to not keep a duplicate copy of the xchat-gnome.desktop file. -- Mathieu Trudel-Lapierre Tue, 05 Jul 2011 12:27:58 -0400 xchat-gnome (1:0.30.0~git20100421.29cc76-1) unstable; urgency=low * New upstream git snapshot. + Correctly links to libm and libX11. Closes: #556693. * Switch to 3.0 source format. * Use autogen.sh, build-depend on the autotools. * Update build-dependencies. * Drop all patches, they are included now. * 01_link_libice.patch: new patch. Correctly link to libICE. * Fix long description. * 02_libnotify_compat.patch: new patch. Support libnotify 0.5 correctly. * 03_dcc_window.patch: new patch. Don’t set the DCC window visible upon startup. -- Josselin Mouette Fri, 22 Apr 2011 00:02:36 +0200 xchat-gnome (1:0.26.1+git20101206.557c940-0ubuntu6) oneiric; urgency=low [ Jeremy Nickurak ] * debian/patches/10_xchat-gnome-close-event.patch: add events for window close, LP: #722739 -- Dustin Kirkland Mon, 14 Mar 2011 12:22:59 -0500 xchat-gnome (1:0.26.1+git20101206.557c940-0ubuntu5) oneiric; urgency=low * Rebuild for Perl 5.12. -- Colin Watson Sun, 08 May 2011 13:43:36 +0100 xchat-gnome (1:0.26.1+git20101206.557c940-0ubuntu4) natty; urgency=low * Fix LP: #767087 - Don't try to create zero-width pixmaps, as this fills ~/.xsession-errors up with Gdk-CRITICAL errors - add debian/patches/52_no_zero_width_pixmaps.patch - update debian/patches/series -- Chris Coulson Wed, 20 Apr 2011 12:54:29 +0100 xchat-gnome (1:0.26.1+git20101206.557c940-0ubuntu3) natty; urgency=low * debian/control.in - Added a suggests for xchat-gnome-indicator * debian/xchat-gnome.gconf-defaults - Set the default enabled plugins, indicator, netmonitor, and notifyosd -- Ken VanDine Fri, 11 Feb 2011 10:47:03 -0500 xchat-gnome (1:0.26.1+git20101206.557c940-0ubuntu2) natty; urgency=low * debian/control: - Build-depend on gnome-common -- Robert Ancell Wed, 05 Jan 2011 09:45:57 +1100 xchat-gnome (1:0.26.1+git20101206.557c940-0ubuntu1) natty; urgency=low * debian/control: - Use standards version 3.9.1 * debian/source: - Use source version 3.0 * debian/rules: - Don't use simple-patchsys.mk [ Mathieu Trudel-Lapierre ] * New upstream snapshot from Git: 2010-12-06, rev 557c940. * debian/control{,.in}: - Drop Build-Depends on libgnome, libgnomeui, since they are no longer required by configure. * debian/control{,.in}: - Add Build-Depends on libsm-dev >= 1.0.0, new dependency introduced in 0.26.2. * debian/patches/10_obey_nick_suffix.patch: * debian/patches/11_topic_return.patch: * debian/patches/21_add_gui_info_ptr.patch: - Dropped, applied upstream. * debian/patches/50_serverlist_update.patch: - Dropped, applied upstream. The freenode port changes are split to 51_freenode_default_port_8001.patch. * debian/patches/51_freenode_default_port_8001.patch: - Avoid connecting to ports in the 6660-6669 range for Freenode to workaround an old DCC exploit. * debian/patches/98_autoconf.patch: - Not required with dh-autoreconf * debian/rules: - Run dh_autoreconf to take into account build process changes for the various patches (and also because a snapshot from git is not configured yet). * debian/control{,.in}: - Add Build-Depends on dh-autoreconf for the added call to dh_autoreconf. * debian/control{,.in}: - Change libnotify build-depends to libnotify4-dev (>= 0.7.0) so that the notify-osd plugin will build properly (the NOTIFY_CHECK_VERSION macro isn't available otherwise). * debian/patches/98_ice_depends_for_eggsmclient.patch: - Add missing ice dependency for the egg_smclient parts, which will allow linking to succeed. -- Robert Ancell Tue, 04 Jan 2011 18:03:09 +1100 xchat-gnome (1:0.26.1-3) unstable; urgency=low * Update description, based on an Ubuntu patch. Closes: #590238. * Pick some patches from upstream git. + 01_reduce_wakeups.patch: trivial change to limit the number of wakeups. + 02_auto_back.patch: use /back instead of /away to mark the user as back. + 03_topic_return.patch: replaces 11_topic_return.patch. + 04_crasher_autojoin.patch: fix crasher when the autojoin list is empty. Closes: #524410. + 05_nick_suffix.patch: replace 10_obey_nick_suffix.patch. + 06_freenode_servers.patch, 06_oz.org_servers.patch: replace 50_serverlist_update.patch. + 07_crasher_null.patch: fix null pointer dereference. - 07_crasher_null_fix.patch: fix regression introduced by this patch. + 08_dcc_transfers.patch: get DCC transfers to work on fresh installs. -- Josselin Mouette Sun, 31 Oct 2010 11:08:23 +0100 xchat-gnome (1:0.26.1-2) unstable; urgency=low * Add references in patches. * Add missing build-dependency on docbook-xml. Closes: #586545. -- Josselin Mouette Sat, 26 Jun 2010 09:40:05 +0200 xchat-gnome (1:0.26.1-1ubuntu3) maverick; urgency=low * Update description (LP: #596022) -- K. Vishnoo Charan Reddy Sun, 25 Jul 2010 14:50:18 +0530 xchat-gnome (1:0.26.1-1ubuntu2) lucid; urgency=low * debian/patches/21_add_gui_info_ptr.patch - implemented win_ptr, returns a pointer to the gtk window (LP: #503665) * debian/patches/20_add_gui_focus.patch - implemented GUI FOCUS (LP: #503666) -- Ken VanDine Tue, 05 Jan 2010 21:50:18 -0500 xchat-gnome (1:0.26.1-1ubuntu1) karmic; urgency=low * Merge from debian unstable, remaining changes: (LP: #387256) - debian/control{.in} - build-dep on liblaunchpadintegration-dev - debian/watch - also look for unstable versions - debian/patches - add 01_lpi.patch - provide Launchpad-Integration - add 04_autojoin_ubuntu_chan.patch - add 95_apturl-support.patch - support apt://-urls - add 98_autoconf.patch - autoconf update -- Andreas Moog Mon, 15 Jun 2009 13:07:41 +0200 xchat-gnome (1:0.26.1-1) unstable; urgency=low [ Luca Bruno ] * New upstream release - Set the plugin context for the notification. Closes: #436084 [ Josselin Mouette ] * 10_obey_nick_suffix.patch: new patch. Obey the configured completion_suffix (which is a comma by default in the shipped configuration) when autocompleting nicknames. * 11_topic_return.patch: new patch. Don’t cut the topic at the cursor position when pressing return in the topic dialog. -- Josselin Mouette Sat, 13 Jun 2009 14:14:20 +0200 xchat-gnome (1:0.26.1-0ubuntu1) jaunty; urgency=low * New upstream release: (LP: #360428) - Translation updates * debian/control.in: - add Vcs-Bzr tag - re-generate debian/control * Adapt debian/watch to new GNOME path -- Didier Roche Mon, 13 Apr 2009 12:48:03 +0200 xchat-gnome (1:0.26.0-0ubuntu2) jaunty; urgency=low * No-change rebuild to fix lpia shared library dependencies. -- Matthias Klose Sun, 22 Mar 2009 16:52:49 +0100 xchat-gnome (1:0.26.0-0ubuntu1) jaunty; urgency=low * New upstream version -- Sebastien Bacher Mon, 16 Mar 2009 11:07:31 +0100 xchat-gnome (1:0.24.3.1-1) unstable; urgency=low * Set the team as primary maintainer. Closes: #523544. * New upstream release. * Standards version is 3.8.1. -- Josselin Mouette Sat, 11 Apr 2009 00:24:02 +0200 xchat-gnome (1:0.24.3.1-0ubuntu1) jaunty; urgency=low * New upstream version (LP: #318012) - Bug fix (#565958). - Updated translations. * Update of debian/patches/98_autoconf.patch. -- Christophe Sauthier Fri, 16 Jan 2009 18:49:03 +0100 xchat-gnome (1:0.24.1-1) experimental; urgency=low [ Luca Bruno ] * New upstream release * Removed patches as they're applied in upstream: - debian/patches/50_fix_color_codes.patch - debian/patches/50_fix_file_set_signal_connect.patch - debian/patches/50_from_svn_fix_italian_translation.patch - debian/patches/65_implicit-pointer-conversion-gettext.patch - debian/patches/80_fix_languages_selection.patch - debian/patches/81_no_translation_informations_in_query.patch - debian/patches/90_from_svn_fix_away_back_command.patch * debian/control.in BuildDepend: - increase version on libgtk2.0-dev (>= 2.14.0), libglib2.0-dev (>= 2.18.0) and libglade2-dev (>= 2.3.2) - remove libgnomevfs2-dev - added libcanberra-gtk-dev (>= 0.3) - added intltool (>= 0.35.0) * debian/copyright: - note src/libcontrast/contrast.{c,h} are MIT/X11 licensed [ Emilio Pozuelo Monfort ] * Remove libxml-parser-perl build-dependency, not needed anymore. * Fix watch file. [ Loic Minier ] * Use GNOME FTP in copyright and for gnome-get-source.mk -- consistent with watch file. -- Luca Bruno Sat, 06 Dec 2008 09:39:55 +0100 xchat-gnome (1:0.24.1-0ubuntu1) intrepid; urgency=low * New upstream release (LP: #286597) - Updated icons - Updated translations -- Didier Roche Mon, 20 Oct 2008 22:08:40 +0200 xchat-gnome (1:0.24.0-0ubuntu1) intrepid; urgency=low * New upstream release: (LP: #273328) - Bug fixes (#431785, #551515) - Translation updates * debian/patches: - Remove 90_configure_ac.patch, merged upstream - Updated 98_autoconf.patch to apply cleanly - Added 95_apturl-support.patch for apturl integration (LP: #217611) -- Andreas Moog Mon, 22 Sep 2008 23:26:43 +0200 xchat-gnome (1:0.23.92-0ubuntu1) intrepid; urgency=low * New Upstream release (LP: #268079) - Lots of bugfixes. - Ported to GIO. * debian/control.in: - added Build-Depends on libcanberra-gtk-dev version 0.3 - updated Build-Depends on libglade2-dev to version 2.3.2 - updated Build-Depends on libgtk-2.0-dev to version 2.14.0 - updated Build-Depends on libglib2.0-dev to version 2.18.0 - dropped Build-Depends on libgnomevfs-dev (no longer used) * debian/patches: - added 90_configure_ac.patch: - patch to configure.ac to correctly build all plugins (Sebastien Bacher) - these are merged upstream: - dropped 50_fix_color_codes.patch - dropped 50_fix_file_signal_connect.patch - dropped 50_from_svn_fix_italian_translation.patch - dropped 65_implicit-pointer-conversion-gettext.patch - dropped 80_fix_languages_selection.patch - dropped 81_no_translation_informations_in_query.patch - dropped 90_from_svn_fix_away_back_command.patch -- Andreas Moog Tue, 09 Sep 2008 12:48:28 +0200 xchat-gnome (1:0.18-3ubuntu2) intrepid; urgency=low * debian/patches/90_from_svn_fix_away_back_command.patch - Updated patch to svn 2630. Maintains away fix and adds some variable decleration movement to allow return from function on_nickname_clicked if session is NULL prior to any further processing. -- Philip Wyett Wed, 27 Aug 2008 12:57:37 +0100 xchat-gnome (1:0.18-3ubuntu1) intrepid; urgency=low * Sync on Debian * debian/control.in: - Build-Depends on liblaunchpad-integration-dev * debian/patches/02_lpi.patch - launchpad integration * debian/patches/04_autojoin_ubuntu_chan.patch - join ubuntu support chan at start * debian/patches/98_autoconf.patch - launchpad integration -- Sebastien Bacher Thu, 14 Aug 2008 10:00:10 +0200 xchat-gnome (1:0.18-3) unstable; urgency=low * debian/copyright: - updated Copyright to reflect AUTHORS. - added a valid Copyright period. * debian/control.in: - don't depend on a specific version of libssl. - updated to Standards-Version: 3.8.0. - remove scrollkeeper dependency, it's disabled in configure. * debian/rules: - remove the empty usr/man/ dir in xchat-gnome-common. * debian/xchat-gnome.menu: - updated to the new menu policy. * debian/patches/*: - updated paths to be usable from the top dir with -p1. - add descriptions taken from debian/changelog. * debian/patches/50_serverlist_update.patch: - new patch, imported from ubuntu. - modify default port for irc.freenode.com to 8001 to prevent dcc exploit. - fix Oz.net servers list wrongly referring to OzNet (LP: #146434). * debian/patches/50_fix_color_codes.patch: - new patch, imported from ubuntu. - Add ^C instead of %C for irc color codes (LP: #155543). Thanks Aaron Haviland for the patch * debian/patches/50_fix_file_set_signal_connect.patch: - new patch, fixes the preferences dialog connecting on the wrong signal and hence eating all the cpu and memory, closes: #476762. * debian/patches/50_from_svn_fix_italian_translation.patch: - new patch from SVN to fix a bad string in italian translation that was causing a crasher, closes: #456171. * debian/patches/90_from_svn_fix_away_back_command.patch: - updated, rename a clashing variable 'away' to 'away_state' as it was conflicting with a widget, closes: #455699. -- Diego Escalante Urrelo Tue, 12 Aug 2008 20:24:18 -0500 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 Wed, 05 Dec 2007 00:48:49 +0100 xchat-gnome (1:0.18-1) unstable; urgency=low * New upstream release. * Patches: - 60_fix-xml-override: dropped - 65_implicit-pointer-conversion-gettext: updated -- Norbert Tretkowski Tue, 25 Sep 2007 17:50:49 +0200 xchat-gnome (1:0.17-2) unstable; urgency=low * Remove duplicate libglib2.0-dev build-dep. * New patch, 65_implicit-pointer-conversion-gettext, fixes a couple of implicit pointer conversion for the _() gettext function; thanks Dann Frazier for the report; note: a different fix thant the proposed patch was used; GNOME #447453; closes: #428459. -- Loic Minier Thu, 14 Jun 2007 11:52:40 +0200 xchat-gnome (1:0.17-1) unstable; urgency=low [ Sven Arvidsson ] * Update xchat-gnome-common to include etc, makes sure the gconf schemas are included (Closes: #412035) [ Loic Minier ] * Add missing build-deps on libglib2.0-dev (>= 2.12.0), libgnome2-dev (>= 2.16.0). * Bump up build-deps to libglade2-dev >= 2.3.0, libgconf2-dev >= 2.8.0. * Update URL in copyright. * Wrap build-deps and deps. * Pass --as-needed via LDFLAGS instead of CFLAGS; build-dep on cdbs >= 0.4.41. * Cleanups. * New upstream release. - Bump up libsexy-dev build-dep to 0.1.11. * Don't build out of tree as if fails with the current gnome-doc-utils upstream uses; closes: #420322. * Include CDBS' utils. * New patch, 60_fix-xml-override, fixes local override of Glade xml var; no idea how this could work without this fix; GNOME #446287. -- Loic Minier Mon, 11 Jun 2007 11:49:13 +0200 xchat-gnome (1:0.16-1) experimental; urgency=low [ Marco Cabizza ] * New upstream release: - remove debian/xchat-gnome.1 as it's merged upstream, and fix some things [debian/rules] [ Loic Minier ] * Add a get-orig-source target to retrieve the upstream tarball. -- Marco Cabizza Mon, 15 Jan 2007 22:25:45 +0100 xchat-gnome (1:0.15-1) experimental; urgency=low * New upstream release (Closes: #396009, #396010): - updated dependencies (target experimental) [control, control.in] - fixes many bugs, including the conflict with the main clipboard (Closes: #404736) -- Marco Cabizza Wed, 1 Nov 2006 14:30:37 +0100 xchat-gnome (1:0.13-1) unstable; urgency=low * New upstream release: - fixes the command completion crash (Closes: #377133) - fixes the keyed channels autojoining issue * Added a Debian menu entry (Closes: #382823) * Build-depend on libssl-dev -- Marco Cabizza Thu, 10 Aug 2006 17:58:49 +0200 xchat-gnome (1:0.12-2) unstable; urgency=low * Add exemption to debian/copyright from COPYING to allow SSL support -- Marco Cabizza Fri, 30 Jun 2006 18:43:28 +0200 xchat-gnome (1:0.12-1) unstable; urgency=low * New upstream release: forking off Ubuntu, first Debian release (Closes: #258268) * Fixed libsexy dependency to 0.1.7 according to configure.ac * 02_lpi.patch, 03_autoconf.patch: dropped, Debian doesn't include LPI * Added two manpages [xchat-gnome.1, xchat-gnome-remote.1] * Standards-Version is 3.7.2, debhelper compat is 5 * Created xchat-gnome-common package for the arch-indep files -- Marco Cabizza Wed, 7 Jun 2006 15:09:01 +0200 xchat-gnome (0.10-0ubuntu2) dapper; urgency=low * debian/rules: Add -Wl,--as-needed to CFLAGS to get rid of a lot of useless dependencies (amongst them libgnutls11). -- Martin Pitt Thu, 2 Mar 2006 16:42:38 +0100 xchat-gnome (0.10-0ubuntu1) dapper; urgency=low * New upstream version: - Add a sound notification plugin - Session management improvements - Minor UI polish - A huge slew of bug-fixes - fix the crash with discussion,find menu item (Ubuntu: #31510) - fix the help menu item (Ubuntu: #32137) - make change to away clear (Ubuntu: #31470) - fix the icon used on highlight (Ubuntu: #30644) - use window list task animation (Ubuntu: #28391) - right click has a copy menu item (Ubuntu: #29587) * debian/control: - Build-Depends on gnome-doc-utils according to configure requirement * debian/patches/01_chans_autoconnect.patch: - fixed with the new version * debian/patches/03_autoconf.patch: - updated * debian/patches/04_libnotify_api_update.patch: - fixed with the new version * debian/patches/05_notify_osd_escape_text.patch: - fixed with the new version * debian/rules: - don't build,ship scrollkeeper autogenerated files with the package -- Sebastien Bacher Fri, 24 Feb 2006 14:51:47 +0100 xchat-gnome (0.9-0ubuntu5) dapper; urgency=low * debian/patches/05_notify_osd_escape_text.patch: - escape the message before sending it via libnotify (gnome: #328445) -- Michael Vogt Tue, 24 Jan 2006 17:41:15 +0100 xchat-gnome (0.9-0ubuntu4) dapper; urgency=low * debian/patches/04_libnotify_api_update.patch: - updated for the new libnotify API * debian/control: * build with the new libnotify package -- Sebastien Bacher Tue, 24 Jan 2006 16:15:30 +0100 xchat-gnome (0.9-0ubuntu3) dapper; urgency=low * debian/control: - Build-Depends on liblaunchpad-integration-dev -- Sebastien Bacher Mon, 23 Jan 2006 10:38:23 +0100 xchat-gnome (0.9-0ubuntu2) dapper; urgency=low * debian/patches/01_chans_autoconnect.patch: - patch from the CVS, fix the chans autoconnection (Ubuntu: #29288) * debian/patches/02_lpi.patch, debian/patches/03_autoconf.patch: - changes for launchpad integration -- Sebastien Bacher Mon, 23 Jan 2006 00:12:23 +0100 xchat-gnome (0.9-0ubuntu1) dapper; urgency=low * New upstream version: - Implement channel list filtering - Update notify-osd plugin for libnotify >=0.3 - Add UI for setting nickserv auto-identify password - Cooler plugins preferences - Lots and lots of bug-fixes and minor improvements * debian/control.in: - Build-Depends on libssl-dev, upstream updated the copyright for that * debian/patches/notify.patch: - fixed with the new version * debian/patches/ssl_build_fix.patch: - fixed with the new version -- Sebastien Bacher Fri, 20 Jan 2006 21:25:55 +0100 xchat-gnome (0.8-0ubuntu4) dapper; urgency=low * debian/control: - build with the new libnotify * debian/patches/notify.patch: - patch from bugzilla, update for the new libnotify API -- Sebastien Bacher Tue, 10 Jan 2006 11:46:13 +0100 xchat-gnome (0.8-0ubuntu3) dapper; urgency=low * debian/control: - remove the useless Build-Depends on libzvt2.0-dev -- Sebastien Bacher Sat, 7 Jan 2006 16:00:46 +0100 xchat-gnome (0.8-0ubuntu2) dapper; urgency=low * debian/patches/ssl_build_fix.patch: - make the ssl build option work correctly -- Sebastien Bacher Wed, 21 Dec 2005 11:11:19 +0100 xchat-gnome (0.8-0ubuntu1) dapper; urgency=low * New upstream version: - New pop-up userlist - New, relatively sane build-system - Translation support - Translations - various and sundry bugfixes * debian/control.in: - don't Build-Depends on dbus-1-utils - build with dbus 0.60 * debian/patches/fix-for-new-gtk.patch: - fixed with the new version * debian/rules: - cleanup of the package and the configure options for the new build system -- Sebastien Bacher Wed, 21 Dec 2005 00:46:31 +0100 xchat-gnome (0.7-0ubuntu4) dapper; urgency=low * debian/patches/fix-for-new-gtk.patch: - fixes a crasher with the new GTK -- Sebastien Bacher Tue, 13 Dec 2005 01:29:54 +0100 xchat-gnome (0.7-0ubuntu3) dapper; urgency=low * debian/control: - Build-Depends on libnotify-dev libsexy-dev -- Sebastien Bacher Mon, 12 Dec 2005 14:14:10 +0100 xchat-gnome (0.7-0ubuntu2) dapper; urgency=low * debian/control: - Build-Depends on scrollkeeper to fix the current FTBFS. -- Sebastien Bacher Fri, 25 Nov 2005 14:46:06 +0100 xchat-gnome (0.7-0ubuntu1) dapper; urgency=low * New upstream version: - Added a help document - Add background preferences - Add a plugin which intelligently disconnects/reconnects based on network connection status via NetworkManager - Add an "OSD" plugin, which pops up important messages with libnotify - Implement "Save Transcript" - Add a plugin which sets away status based on screensaver state - various and sundry bugfixes -- Sebastien Bacher Thu, 24 Nov 2005 18:57:57 +0100 xchat-gnome (0.6-0ubuntu2) dapper; urgency=low * debian/control: - Build-Depends on libtool, dbus-1-utils.. -- Sebastien Bacher Fri, 4 Nov 2005 12:03:32 -0500 xchat-gnome (0.6-0ubuntu1) dapper; urgency=low * New upstream version. - Set up a gnome url handler for irc:// links - Add "ignore" to the user context menu - Add autoconnect and autojoin options in context menus - Add nickname change dialog when clicking on the nick on the left of the input bar - Add text and files drag and drop support - Beginnings of command completion * debian/control.in: - Build-Depends on the libdbus-glib-1-dev package. -- Sebastien Bacher Tue, 1 Nov 2005 17:26:16 -0500 xchat-gnome (0.5-0ubuntu2) breezy; urgency=low * debian/rules: removed xchat.desktop and xchat.png cause it points to real xchat from main. (Closes: Malone #2167) -- Stephan Hermann Sat, 17 Sep 2005 11:37:32 +0200 xchat-gnome (0.5-0ubuntu1) breezy; urgency=low * New upstream version. * debian/control: - updated the Build-Depends. -- Sebastien Bacher Wed, 14 Sep 2005 12:34:42 +0200 xchat-gnome (0.4-0ubuntu4) breezy; urgency=low * Rebuild again to rid us of the unwanted libglitz dependency. -- Adam Conrad Tue, 30 Aug 2005 06:09:08 +1000 xchat-gnome (0.4-0ubuntu3) breezy; urgency=low * Rebuild with the new cairo version -- Sebastien Bacher Thu, 18 Aug 2005 17:23:36 +0000 xchat-gnome (0.4-0ubuntu2) breezy; urgency=low * debian/control: - fixed the Build-Depends. -- Sebastien Bacher Fri, 12 Aug 2005 14:55:12 +0200 xchat-gnome (0.4-0ubuntu1) breezy; urgency=low * Initial package. -- Sebastien Bacher Sun, 24 Jul 2005 14:17:00 +0200 debian/xchat-gnome.gconf-defaults0000664000000000000000000000023411770727100014226 0ustar /apps/xchat/plugins/loaded [/usr/lib/xchat-gnome/plugins/indicator.so,/usr/lib/xchat-gnome/plugins/notifyosd.so,/usr/lib/xchat-gnome/plugins/netmonitor.so] debian/source/0000775000000000000000000000000011770727100010472 5ustar debian/source/format0000664000000000000000000000001411770727100011700 0ustar 3.0 (quilt) debian/compat0000664000000000000000000000000211770727100010370 0ustar 5 debian/patches/0000775000000000000000000000000012256660715010631 5ustar debian/patches/107-fix-permissions-on-creating-files.patch0000664000000000000000000000157011770727100020615 0ustar From 852bbdd65c2dd8c7aa89076de63edd1d8fcf2edf Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 16:37:57 -0700 Subject: [PATCH 8/8] Cherrypick r1241: fix permissions on creating files. --- src/common/cfgfiles.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/common/cfgfiles.c b/src/common/cfgfiles.c index 330967a..3fc44fe 100644 --- a/src/common/cfgfiles.c +++ b/src/common/cfgfiles.c @@ -1066,7 +1066,12 @@ xchat_open_file (char *file, int flags, int mode, int xof_flags) char buf[1024]; if (xof_flags & XOF_FULLPATH) - return open (file, flags | OFLAGS); + { + if (xof_flags & XOF_DOMODE) + return open (file, flags | OFLAGS, mode); + else + return open (file, flags | OFLAGS); + } snprintf (buf, sizeof (buf), "%s/%s", get_xdir_fs (), file); if (xof_flags & XOF_DOMODE) -- 1.7.4.1 debian/patches/00git_remember_window_maximise.patch0000664000000000000000000001127511770727100017734 0ustar From f5d0422bc534d071c6b61fcbb79025132030b296 Mon Sep 17 00:00:00 2001 From: Robert Ancell Date: Fri, 22 Jun 2012 11:02:25 +1200 Subject: [PATCH] Correctly restore maximized window state --- src/fe-gnome/apps_xchat.schemas.in | 11 +++++++++++ src/fe-gnome/gui.h | 1 + src/fe-gnome/main-window.c | 29 +++++++++++++++++++++++++++-- 3 files changed, 39 insertions(+), 2 deletions(-) Index: xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/apps_xchat.schemas.in =================================================================== --- xchat-gnome-0.30.0~git20110821.e2a400.orig/src/fe-gnome/apps_xchat.schemas.in 2011-02-23 18:26:14.000000000 +1300 +++ xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/apps_xchat.schemas.in 2012-06-22 11:24:02.026433693 +1200 @@ -200,6 +200,17 @@ + /schemas/apps/xchat/main_window/maximized + /apps/xchat/main_window/maximized + xchat + bool + false + + Whether the main window is maximized + + + + /schemas/apps/xchat/main_window/x /apps/xchat/main_window/x xchat Index: xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/gui.h =================================================================== --- xchat-gnome-0.30.0~git20110821.e2a400.orig/src/fe-gnome/gui.h 2011-07-28 09:00:57.000000000 +1200 +++ xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/gui.h 2012-06-22 11:24:02.026433693 +1200 @@ -49,6 +49,7 @@ GtkWidget *conversation_panel; GtkWidget *find_bar; GtkWidget *main_window; + gboolean maximized; GtkWidget *status_bar; GtkWidget *text_entry; GtkWidget *topic_label; Index: xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/main-window.c =================================================================== --- xchat-gnome-0.30.0~git20110821.e2a400.orig/src/fe-gnome/main-window.c 2012-06-22 11:23:58.474433816 +1200 +++ xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/main-window.c 2012-06-22 11:24:02.026433693 +1200 @@ -82,6 +82,7 @@ static void on_add_widget (GtkUIManager *manager, GtkWidget *menu, GtkWidget *menu_vbox); static gboolean on_resize (GtkWidget *widget, GdkEventConfigure *event, gpointer data); +static gboolean on_state_change (GtkWidget *widget, GdkEventWindowState *event, gpointer data); static gboolean on_hpane_move (GtkPaned *widget, GParamSpec *param_spec, gpointer data); static gboolean on_main_window_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer data); @@ -154,6 +155,7 @@ GdkColormap *colormap; gui.main_window = GTK_WIDGET (gtk_builder_get_object (gui.xml, "xchat-gnome")); + gui.maximized = FALSE; colormap = gdk_screen_get_rgba_colormap (gtk_widget_get_screen (gui.main_window)); if (colormap != NULL) @@ -264,7 +266,12 @@ width = 800; height = 550; } + gboolean maximized = gconf_client_get_bool(client, + "/apps/xchat/main_window/maximized", + NULL); gtk_window_set_default_size(GTK_WINDOW(gui.main_window), width, height); + if (maximized) + gtk_window_maximize(GTK_WINDOW(gui.main_window)); int x = gconf_client_get_int (client, "/apps/xchat/main_window/x", NULL); int y = gconf_client_get_int (client, "/apps/xchat/main_window/y", NULL); @@ -281,6 +288,8 @@ } g_signal_connect(G_OBJECT(gui.main_window), "configure-event", G_CALLBACK(on_resize), NULL); + g_signal_connect(G_OBJECT(gui.main_window), "window-state-event", + G_CALLBACK(on_state_change), NULL); GtkWidget *pane = GTK_WIDGET (gtk_builder_get_object (gui.xml, "HPane")); g_signal_connect(G_OBJECT(pane), "notify::position", @@ -661,10 +670,26 @@ { GConfClient *client; + if (!gui.maximized) { + client = gconf_client_get_default (); + gconf_client_set_int (client, "/apps/xchat/main_window/width", event->width, NULL); + gconf_client_set_int (client, "/apps/xchat/main_window/height", event->height, NULL); + g_object_unref (client); + } + + return FALSE; +} + +static gboolean +on_state_change (GtkWidget *widget, GdkEventWindowState *event, gpointer data) +{ + GConfClient *client; + client = gconf_client_get_default (); - gconf_client_set_int (client, "/apps/xchat/main_window/width", event->width, NULL); - gconf_client_set_int (client, "/apps/xchat/main_window/height", event->height, NULL); + gui.maximized = (event->new_window_state & GDK_WINDOW_STATE_MAXIMIZED) != 0; + gconf_client_set_bool (client, "/apps/xchat/main_window/maximized", gui.maximized, NULL); g_object_unref (client); + return FALSE; } debian/patches/105-Use-u-instead-of-s.patch0000664000000000000000000000262111770727100015433 0ustar From a3ebce97e2e08e3a38043aaf28b7880662ad423e Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 15:46:01 -0700 Subject: [PATCH 6/8] Use %u instead of %s http://sourceforge.net/tracker/?func=detail&aid=2157459&group_id=239&atid=100239 Programs using the glib/gio API function g_app_info_launch() or the gtk function gtk_show_uri() to launch an irc://[SERVER]/[CHANNEL] uri use the information from xchat2/src/common/dbus/apps_xchat_url_handler.schemas to start xchat, but fail to connect to the correct server because gio does not recognize the %s option. According to http://standards.freedesktop.org/desktop-entry-spec/latest/ar01s06.html, you should not use the %s option, but use the %u option instead. --- src/common/dbus/url_handler.schemas.in | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/common/dbus/url_handler.schemas.in b/src/common/dbus/url_handler.schemas.in index cf08a55..44d7a33 100644 --- a/src/common/dbus/url_handler.schemas.in +++ b/src/common/dbus/url_handler.schemas.in @@ -5,7 +5,7 @@ /desktop/gnome/url-handlers/irc/command xchat string - xchat-gnome --existing --url=%s + xchat-gnome --existing --url=%u The handler for "irc://" URLs -- 1.7.4.1 debian/patches/110-fix-fd-leak.patch0000664000000000000000000000120211770727100014223 0ustar Description: fix a file handle leak Origin: http://xchat.org/files/source/2.8/patches/xc284-fix-scrollbfdleak.diff Bug: https://bugzilla.gnome.org/show_bug.cgi?id=657536 Bug-Ubuntu: https://bugs.launchpad.net/xchat-gnome/+bug/829009 Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/text.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/text.c 2011-08-27 23:50:48.922733313 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/text.c 2011-08-27 23:51:11.362733468 -0400 @@ -146,6 +146,7 @@ } *len = st.st_size; + close (fh); return buf; } debian/patches/20_add_gui_focus.patch0000664000000000000000000000140511770727100014736 0ustar # # Description: The GUI FOCUS command from xchat should be implemented in xchat-gnome # Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/503666 # Upstream: https://bugzilla.gnome.org/show_bug.cgi?id=600548 # === modified file 'src/fe-gnome/fe-gnome.c' Index: xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c =================================================================== --- xchat-gnome-0.26.1.orig/src/fe-gnome/fe-gnome.c 2010-12-17 15:18:38.000000000 +1100 +++ xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c 2010-12-17 15:43:00.947712000 +1100 @@ -766,6 +766,8 @@ break; case FE_GUI_FOCUS: + navigation_tree_select_session (gui.server_tree, sess); + break; case FE_GUI_FLASH: navigation_tree_select_session (gui.server_tree, sess); break; debian/patches/100-Zero-out-passwords-upon-exit.patch0000664000000000000000000000437711770727100017650 0ustar From 06668cdd8fd756bfc5201fb77080d8d3ecf96650 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 14:24:51 -0700 Subject: [PATCH 1/8] Zero out passwords upon exit. Cherrypick from xchat r1299 --- src/common/servlist.c | 34 ++++++++++++++++++++++++++++++---- src/common/servlist.h | 1 + src/common/xchat.c | 1 + 3 files changed, 32 insertions(+), 4 deletions(-) diff --git a/src/common/servlist.c b/src/common/servlist.c index b38ac4f..8ec7d05 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -809,6 +809,34 @@ servlist_server_remove_all (ircnet *net) } } +static void +free_and_clear (char *str) +{ + if (str) + { + char *orig = str; + while (*str) + *str++ = 0; + free (orig); + } +} + +/* executed on exit: Clear any password strings */ + +void +servlist_cleanup (void) +{ + GSList *list; + ircnet *net; + + for (list = network_list; list; list = list->next) + { + net = list->data; + free_and_clear (net->pass); + free_and_clear (net->nickserv); + } +} + void servlist_net_remove (ircnet *net) { @@ -836,14 +864,12 @@ servlist_net_remove (ircnet *net) free (net->user); if (net->real) free (net->real); - if (net->pass) - free (net->pass); + free_and_clear (net->pass); if (net->autojoin) free (net->autojoin); if (net->command) free (net->command); - if (net->nickserv) - free (net->nickserv); + free_and_clear (net->nickserv); if (net->comment) free (net->comment); if (net->encoding) diff --git a/src/common/servlist.h b/src/common/servlist.h index d4c5ce1..1680e37 100644 --- a/src/common/servlist.h +++ b/src/common/servlist.h @@ -43,6 +43,7 @@ int servlist_connect_by_netname (session *sess, char *network, gboolean join); int servlist_auto_connect (session *sess); int servlist_have_auto (void); int servlist_check_encoding (char *charset); +void servlist_cleanup (void); ircnet *servlist_net_add (char *name, char *comment, int prepend); void servlist_net_remove (ircnet *net); diff --git a/src/common/xchat.c b/src/common/xchat.c index dd4cd90..0c40f02 100644 --- a/src/common/xchat.c +++ b/src/common/xchat.c @@ -992,6 +992,7 @@ xchat_exit (void) notify_save (); ignore_save (); free_sessions (); + servlist_cleanup (); fe_exit (); } -- 1.7.4.1 debian/patches/108-userlist-default-width.patch0000664000000000000000000000224711770727100016566 0ustar Description: make sure the userlist in the main window has a reasonable width by default. Author: Marc Deslauriers Forwarded: yes Bug: https://bugzilla.gnome.org/show_bug.cgi?id=657534 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/828788 Index: xchat-gnome-0.30.0~git20100421.29cc76/data/xchat-gnome.glade =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/data/xchat-gnome.glade 2011-08-27 19:49:13.832634631 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/data/xchat-gnome.glade 2011-08-27 19:49:47.052634860 -0400 @@ -342,6 +342,7 @@ True True + 35 GTK_POLICY_AUTOMATIC GTK_POLICY_AUTOMATIC GTK_SHADOW_IN debian/patches/109-use-scrollback-timestamps.patch0000664000000000000000000001635611770727100017261 0ustar Description: use actual timestamps when loading scrollback files, code similar to what xchat does. Author: Marc Deslauriers Forwarded: yes Bug: https://bugzilla.gnome.org/show_bug.cgi?id=657535 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/834816 Index: xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/conversation-panel.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/fe-gnome/conversation-panel.c 2011-08-27 22:45:47.072706749 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/conversation-panel.c 2011-08-27 22:46:48.202707167 -0400 @@ -91,7 +91,8 @@ xtext_buffer *buffer, char *text, int len, - gboolean indent); + gboolean indent, + time_t timet); static void conversation_panel_lastlog_foreach (GtkXText *xtext, char *text, fe_lastlog_info *info); @@ -1089,7 +1090,7 @@ } static void -conversation_panel_print_line (ConversationPanel *panel, xtext_buffer *buffer, char *text, int len, gboolean indent) +conversation_panel_print_line (ConversationPanel *panel, xtext_buffer *buffer, char *text, int len, gboolean indent, time_t timet) { if (len == 0) { return; @@ -1100,7 +1101,10 @@ char *stamp; guchar *new_text; - stamp_size = get_stamp_str (prefs.stamp_format, time(NULL), &stamp); + if (timet == 0) + timet = time (NULL); + + stamp_size = get_stamp_str (prefs.stamp_format, timet, &stamp); new_text = g_malloc (len + stamp_size + 1); memcpy (new_text, stamp, stamp_size); g_free (stamp); @@ -1117,21 +1121,21 @@ if(!panel->priv->redundant_nickstamps && strncmp (buffer->laststamp, text, leftlen) == 0) { text = tab+1; len -= leftlen; - gtk_xtext_append_indent (buffer, 0, 0, (unsigned char*) text, len, time(NULL)); + gtk_xtext_append_indent (buffer, 0, 0, (unsigned char*) text, len, timet); } else { strncpy (buffer->laststamp, text, leftlen); buffer->laststamp[leftlen]=0; gtk_xtext_append_indent (buffer, (unsigned char*) text, leftlen, (unsigned char*) tab + 1, strlen (text) - leftlen - 1, - time(NULL)); + timet); } } else { - gtk_xtext_append_indent (buffer, 0, 0, (unsigned char*) text, len, time(NULL)); + gtk_xtext_append_indent (buffer, 0, 0, (unsigned char*) text, len, timet); } } void -conversation_panel_print (ConversationPanel *panel, struct session *sess, char *text, gboolean indent) +conversation_panel_print (ConversationPanel *panel, struct session *sess, char *text, gboolean indent, time_t stamp) { xtext_buffer *buffer; char *last_text = text; @@ -1150,10 +1154,10 @@ while (1) { switch (*text) { case '\0': - conversation_panel_print_line (panel, buffer, last_text, len, indent); + conversation_panel_print_line (panel, buffer, last_text, len, indent, stamp); return; case '\n': - conversation_panel_print_line (panel, buffer, last_text, len, indent); + conversation_panel_print_line (panel, buffer, last_text, len, indent, stamp); text++; if (*text == '\0') return; @@ -1189,7 +1193,7 @@ conversation_panel_lastlog_foreach (GtkXText *xtext, char *text, fe_lastlog_info *info) { if (nocasestrstr (text, (char*) info->sstr)) { - conversation_panel_print (info->panel, info->sess, text, prefs.indent_nicks); + conversation_panel_print (info->panel, info->sess, text, prefs.indent_nicks, time(NULL)); } } @@ -1202,7 +1206,7 @@ lbuffer = g_hash_table_lookup (panel->priv->buffers, lsess); if (gtk_xtext_is_empty (buffer)) { - conversation_panel_print (panel, lsess, _("Search buffer is empty.\n"), TRUE); + conversation_panel_print (panel, lsess, _("Search buffer is empty.\n"), TRUE, time(NULL)); } else { fe_lastlog_info info; info.panel = panel; Index: xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/conversation-panel.h =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/fe-gnome/conversation-panel.h 2011-08-27 22:45:47.022706748 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/conversation-panel.h 2011-08-27 22:46:48.202707167 -0400 @@ -62,7 +62,8 @@ void conversation_panel_print (ConversationPanel *panel, struct session *sess, char *text, - gboolean indent); + gboolean indent, + time_t stamp); void conversation_panel_remove_session (ConversationPanel *panel, struct session *sess); void conversation_panel_lastlog (ConversationPanel *panel, Index: xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/fe-gnome.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/fe-gnome/fe-gnome.c 2011-08-27 22:46:47.962707165 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/fe-gnome.c 2011-08-27 22:46:48.202707167 -0400 @@ -474,7 +474,7 @@ } conversation_panel_print (CONVERSATION_PANEL (gui.conversation_panel), - sess, text, prefs.indent_nicks); + sess, text, prefs.indent_nicks, stamp); sess->new_data = TRUE; navigation_model_set_hilight (gui.tree_model, sess); if (sess->nick_said) { Index: xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/text-entry.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/fe-gnome/text-entry.c 2011-08-27 22:45:47.052706752 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/text-entry.c 2011-08-27 23:03:08.402713842 -0400 @@ -495,7 +495,7 @@ g_free (printtext); printtext = npt; } - conversation_panel_print (CONVERSATION_PANEL (gui.conversation_panel), text_entry->priv->current, printtext, TRUE); + conversation_panel_print (CONVERSATION_PANEL (gui.conversation_panel), text_entry->priv->current, printtext, TRUE, time (NULL)); g_free (printtext); if (new_prefix && strcasecmp (prefix, new_prefix) != 0) { @@ -598,7 +598,7 @@ g_free (printtext); printtext = npt; } - conversation_panel_print (CONVERSATION_PANEL (gui.conversation_panel), text_entry->priv->current, printtext, TRUE); + conversation_panel_print (CONVERSATION_PANEL (gui.conversation_panel), text_entry->priv->current, printtext, TRUE, time (NULL)); g_free (printtext); if (strcasecmp (prefix, new_prefix) != 0) { debian/patches/120-fix-clipboard-segfault.patch0000664000000000000000000000300112014730332016460 0ustar Description: Don't set the CLIPBOARD buffer when selecting text. CLIPBOARD should only be used when specifically selecting copy from a context menu. This may also have the side effect of fixing the common but hard to reproduce clipboard segfault. Author: Marc Deslauriers Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658502 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=635317 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=624792 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/844003 Index: xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/xtext.c =================================================================== --- xchat-gnome-0.30.0~git20110821.e2a400.orig/src/fe-gnome/xtext.c 2011-07-27 17:00:57.000000000 -0400 +++ xchat-gnome-0.30.0~git20110821.e2a400/src/fe-gnome/xtext.c 2012-08-21 11:58:28.895474588 -0400 @@ -2055,22 +2055,12 @@ static void gtk_xtext_set_clip_owner (GtkWidget * xtext, GdkEventButton * event) { - char *str; - int len; - if (GTK_XTEXT (xtext)->selection_buffer && GTK_XTEXT (xtext)->selection_buffer != GTK_XTEXT (xtext)->buffer) gtk_xtext_selection_clear (GTK_XTEXT (xtext)->selection_buffer); GTK_XTEXT (xtext)->selection_buffer = GTK_XTEXT (xtext)->buffer; - str = gtk_xtext_selection_get_text (GTK_XTEXT (xtext), &len); - if (str) - { - gtk_clipboard_set_text (gtk_clipboard_get (GDK_SELECTION_CLIPBOARD), str, len); - free (str); - } - gtk_selection_owner_set (xtext, GDK_SELECTION_PRIMARY, event->time); } debian/patches/101-Sync-in-servers-from-xchat.patch0000664000000000000000000001050011770727100017212 0ustar From 5db43988534205e5d989ca35502a76efa1b1e36f Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 14:43:34 -0700 Subject: [PATCH 2/8] Sync in servers from xchat: r1334: Update XentoniX.net as per request. r1332: Added "MintIRC" to default list. r1357: Added irc.rizon.net to default list. r1379: Renamed insiderZ.DE to iZ-smart.net. Added SeilEn.de. r1418: Added networks: 7-indonesia, ChattingAway, GeekShed, TURLINet. r1487: Added PIRC.PL to default network list. r1495: Updated PTnet.org list (luminoso). --- src/common/servlist.c | 57 +++++++++++++++++++++++++++++++------------------ 1 files changed, 36 insertions(+), 21 deletions(-) diff --git a/src/common/servlist.c b/src/common/servlist.c index 8ec7d05..eeef41e 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -49,6 +49,9 @@ static const struct defaultserver def[] = {"2600net", 0}, {0, "irc.2600.net"}, + {"7-indonesia", 0}, + {0, "irc.7-indonesia.org"}, + {"AccessIRC", 0}, {0, "irc.accessirc.net"}, {0, "eu.accessirc.net"}, @@ -122,6 +125,9 @@ static const struct defaultserver def[] = {"Beirut", 0}, {0, "irc.beirut.com"}, + {"ChattingAway", 0}, + {0, "irc.chattingaway.com"}, + {"ChatJunkies", 0, "#xchat"}, {0, "irc.chatjunkies.org"}, {0, "nl.chatjunkies.org"}, @@ -235,6 +241,9 @@ static const struct defaultserver def[] = {0, "irc.ca.gamesnet.net"}, {0, "irc.eu.gamesnet.net"}, + {"GeekShed", 0}, + {0, "irc.geekshed.net"}, + {"German-Elite", 0}, {0, "dominion.german-elite.net"}, {0, "komatu.german-elite.net"}, @@ -260,9 +269,10 @@ static const struct defaultserver def[] = {0, "Sunshine.Ca.US.Infinity-IRC.Org"}, {0, "IRC.Infinity-IRC.Org"},*/ - {"insiderZ.DE", 0}, - {0, "irc.insiderz.de/6667"}, - {0, "irc.insiderz.de/6666"}, + {"iZ-smart.net", 0}, + {0, "irc.iZ-smart.net/6666"}, + {0, "irc.iZ-smart.net/6667"}, + {0, "irc.iZ-smart.net/6668"}, {"IrcLink", 0}, {0, "irc.irclink.net"}, @@ -311,6 +321,9 @@ static const struct defaultserver def[] = {"MindForge", 0}, {0, "irc.mindforge.org"}, + {"MintIRC", 0}, + {0, "irc.mintirc.net"}, + {"MIXXnet", 0}, {0, "irc.mixxnet.net"}, @@ -347,7 +360,7 @@ static const struct defaultserver def[] = {0, "irc.othernet.org"}, {"Oz.org", 0}, - {0, "irc.oz.org"}, + {0, "irc.oz.org"}, {0, "germany.oz.org"}, {0, "sandiego.oz.org"}, {0, "us.oz.org"}, @@ -360,18 +373,14 @@ static const struct defaultserver def[] = {0, "irc.PTlink.net"}, {0, "aaia.PTlink.net"}, - {"PTNet, ISP's", 0}, + {"PTNet.org", 0}, {0, "irc.PTNet.org"}, - {0, "rccn.PTnet.org"}, - {0, "EUnet.PTnet.org"}, - {0, "madinfo.PTnet.org"}, - {0, "netc2.PTnet.org"}, - {0, "netc1.PTnet.org"}, - {0, "telepac1.ptnet.org"}, - {0, "esoterica.PTnet.org"}, - {0, "ip-hub.ptnet.org"}, - {0, "telepac1.ptnet.org"}, - {0, "nortenet.PTnet.org"}, + {0, "world.PTnet.org"}, + {0, "netvisao.PTnet.org"}, + {0, "uevora.PTnet.org"}, + {0, "vianetworks.PTnet.org"}, + {0, "uc.PTnet.org"}, + {0, "nfsi.ptnet.org"}, {"PTNet, UNI", 0}, {0, "irc.PTNet.org"}, @@ -422,6 +431,9 @@ static const struct defaultserver def[] = {0, "lisa.rizenet.org"}, {0, "scott.rizenet.org"}, + {"Rizon", 0}, + {0, "irc.rizon.net"}, + {"RusNet", 0, 0, "KOI8-R (Cyrillic)"}, {0, "irc.tomsk.net"}, {0, "irc.rinet.ru"}, @@ -434,6 +446,9 @@ static const struct defaultserver def[] = {0, "irc.eu.scene.org"}, {0, "irc.us.scene.org"}, + {"SeilEn.de", 0}, + {0, "irc.seilen.de"}, + {"SlashNET", 0}, {0, "irc.slashnet.org"}, {0, "area51.slashnet.org"}, @@ -468,6 +483,11 @@ static const struct defaultserver def[] = {"TNI3", 0}, {0, "irc.tni3.com"}, + {"TURLINet", 0}, + {0, "irc.turli.net"}, + {0, "irc.servx.ru"}, + {0, "irc.gavnos.ru"}, + {"UnderNet", 0}, {0, "us.undernet.org"}, {0, "eu.undernet.org"}, @@ -488,12 +508,7 @@ static const struct defaultserver def[] = {0, "irc.fr.worldnet.net"}, {"Xentonix.net", 0}, - {0, "irc.ffm.de.eu.xentonix.net"}, -/* {0, "irc.brs.de.eu.xentonix.net"}, - {0, "irc.stg.ch.eu.xentonix.net"}, - {0, "irc.hou.tx.us.xentonix.net"},*/ - {0, "irc.kar.de.eu.xentonix.net"}, - {0, "irc.vie.at.eu.xentonix.net"}, + {0, "irc.xentonix.net"}, {"XWorld", 0}, {0, "Buffalo.NY.US.XWorld.org"}, -- 1.7.4.1 debian/patches/link.diff0000664000000000000000000000107512120436636012414 0ustar Index: xchat-gnome-0.30.0~git20110821.e2a400/configure.ac =================================================================== --- xchat-gnome-0.30.0~git20110821.e2a400.orig/configure.ac 2011-07-27 21:00:57.000000000 +0000 +++ xchat-gnome-0.30.0~git20110821.e2a400/configure.ac 2013-03-14 21:13:31.450725888 +0000 @@ -65,6 +65,7 @@ gio-2.0 >= $GLIB_REQUIRED \ gtk+-2.0 >= $GTK_REQUIRED \ gconf-2.0 >= $GCONF_REQUIRED \ + gmodule-2.0 >= $GCONF_REQUIRED \ libsexy >= $LIBSEXY_REQUIRED \ ]) debian/patches/series0000664000000000000000000000155112256660711012044 0ustar 00git_remember_window_maximise.patch 04_autojoin_ubuntu_chan.patch 20_add_gui_focus.patch 51_freenode_default_port_8001.patch 95_apturl-support.patch 10_xchat-gnome-close-event.patch 100-Zero-out-passwords-upon-exit.patch 101-Sync-in-servers-from-xchat.patch 102-Drop-IPV6-servers.patch 103-Add-chillfactory-irc-servers.patch 104-Don-t-crash-if-servlist-is-undefined.patch 105-Use-u-instead-of-s.patch 106-ensure-an-empty-string-at-index-32-for-cmd_deop-etc.patch 107-fix-permissions-on-creating-files.patch 108-userlist-default-width.patch 109-use-scrollback-timestamps.patch 110-fix-fd-leak.patch 111-increase-channel-limit.patch 115-fix-network-editor.patch 116-remove-amiganet.patch 117-fix-net-monitor-segfault.patch 118-fix-net-monitor-reconnect.patch 119-fix-null-channel-list-window.patch 120-fix-clipboard-segfault.patch link.diff define_functions_fix_build.patch debian/patches/117-fix-net-monitor-segfault.patch0000664000000000000000000000147211770727100017023 0ustar Description: fix segfault in the net monitor plugin Author: Li Li Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/851058 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=660015 Forwarded: yes Index: xchat-gnome-0.30.0~git20100421.29cc76/plugins/net-monitor/net-monitor.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/plugins/net-monitor/net-monitor.c 2011-09-21 15:33:21.620763105 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/plugins/net-monitor/net-monitor.c 2011-09-21 15:33:53.450762847 -0400 @@ -176,7 +176,8 @@ */ res_init(); - g_hash_table_foreach (networks, (GHFunc) connect_to_network, NULL); + if (networks) + g_hash_table_foreach (networks, (GHFunc) connect_to_network, NULL); } } debian/patches/51_freenode_default_port_8001.patch0000664000000000000000000000236211770727100017161 0ustar From: Mathieu Trudel-Lapierre Subject: Drop ports 666x for FreeNode to workaround a possible DCC exploit. Since ports 800x are available for connections to FreeNode, this avoids exposing users an old vulnerability on some routers where a malformed DCC SEND command sent to a client would cause them to get disconnected. Such routers usually try to check what goes on on common IRC ports (6660-6669), so just staying clear from this range is a little safer. This is an old patch ported so that it still works, but given the CVEs are from back in 2006, it's likely it could be dropped without problems. For reference, the CVEs at play were CVE-2006-1067 [1] and CVE-2006-1068 [2]. [1] - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1067 [2] - http://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2006-1068 --- a/src/common/servlist.c 2010-12-09 11:40:03.000000000 -0500 +++ b/src/common/servlist.c 2010-12-09 11:40:25.500695002 -0500 @@ -207,9 +207,6 @@ {0, "irc.vendetta.com"}, {"FreeNode", 0}, - {0, "irc.freenode.net/6665"}, - {0, "irc.freenode.net/6666"}, - {0, "irc.freenode.net/6667"}, {0, "irc.freenode.net/8000"}, {0, "irc.freenode.net/8001"}, {0, "irc.freenode.net/8002"}, debian/patches/111-increase-channel-limit.patch0000664000000000000000000002010011770727100016446 0ustar Description: remove the limitation on the number of autojoin channels, based on code from xchat 2.8.8 Author: Marc Deslauriers Forwarded: yes Bug: https://bugzilla.gnome.org/show_bug.cgi?id=658926 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/751925 Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/inbound.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/inbound.c 2011-09-13 09:45:35.711978492 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/inbound.c 2011-09-13 09:45:59.371978654 -0400 @@ -1015,11 +1015,26 @@ session *sess; GSList *list = sess_list; int i = 0; + GSList *channels, *keys; /* shouldnt really happen, the io tag is destroyed in server.c */ if (!is_server (serv)) return FALSE; + /* send auto join list */ + if (serv->autojoin) + { + joinlist_split (serv->autojoin, &channels, &keys); + serv->p_join_list (serv, channels, keys); + joinlist_free (channels, keys); + + free (serv->autojoin); + serv->autojoin = NULL; + i++; + } + + /* this is really only for re-connects when you + * join channels not in the auto-join list. */ while (list) { sess = list->data; Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/proto-irc.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/proto-irc.c 2011-09-13 09:45:35.731978495 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/proto-irc.c 2011-09-13 09:45:40.261978524 -0400 @@ -94,6 +94,121 @@ } static void +irc_join_list_flush (server *serv, GString *c, GString *k) +{ + char *chanstr, *keystr; + + chanstr = g_string_free (c, FALSE); + keystr = g_string_free (k, FALSE); + if (chanstr[0]) + { + if (keystr[0]) + tcp_sendf (serv, "JOIN %s %s\r\n", chanstr, keystr); + else + tcp_sendf (serv, "JOIN %s\r\n", chanstr); + } + g_free (chanstr); + g_free (keystr); +} + +/* join a whole list of channels & keys, split to multiple lines + * to get around 512 limit */ + +static void +irc_join_list (server *serv, GSList *channels, GSList *keys) +{ + GSList *clist; + GSList *klist; + GString *c = g_string_new (NULL); + GString *k = g_string_new (NULL); + int len; + int add; + int i, j; + + i = j = 0; + len = 9; /* "JOIN\r\n" */ + clist = channels; + klist = keys; + + while (clist) + { + /* measure how many bytes this channel would add... */ + if (1) + { + add = strlen (clist->data); + if (i != 0) + add++; /* comma */ + } + + if (klist->data) + { + add += strlen (klist->data); + } + else + { + add++; /* 'x' filler */ + } + + if (j != 0) + add++; /* comma */ + + /* too big? dump buffer and start a fresh one */ + if (len + add > 512) + { + irc_join_list_flush (serv, c, k); + + c = g_string_new (NULL); + k = g_string_new (NULL); + i = j = 0; + len = 9; + } + + /* now actually add it to our GStrings */ + if (1) + { + add = strlen (clist->data); + if (i != 0) + { + add++; + g_string_append_c (c, ','); + } + g_string_append (c, clist->data); + i++; + } + + if (klist->data) + { + add += strlen (klist->data); + if (j != 0) + { + add++; + g_string_append_c (k, ','); + } + g_string_append (k, klist->data); + j++; + } + else + { + add++; + if (j != 0) + { + add++; + g_string_append_c (k, ','); + } + g_string_append_c (k, 'x'); + j++; + } + + len += add; + + klist = klist->next; + clist = clist->next; + } + + irc_join_list_flush (serv, c, k); +} + +static void irc_part (server *serv, char *channel, char *reason) { if (reason) @@ -1081,6 +1196,7 @@ serv->p_ns_identify = irc_ns_identify; serv->p_ns_ghost = irc_ns_ghost; serv->p_join = irc_join; + serv->p_join_list = irc_join_list; serv->p_login = irc_login; serv->p_join_info = irc_join_info; serv->p_mode = irc_mode; Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/server.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/server.c 2011-09-13 09:45:35.711978492 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/server.c 2011-09-13 09:45:40.261978524 -0400 @@ -1969,6 +1969,8 @@ free (serv->last_away_reason); if (serv->encoding) free (serv->encoding); + if (serv->autojoin) + free (serv->autojoin); fe_server_callback (serv); Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/servlist.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/servlist.c 2011-09-13 09:45:40.181978523 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/servlist.c 2011-09-13 09:45:40.261978524 -0400 @@ -554,8 +554,11 @@ sess->willjoinchannel[0] = 0; if (net->autojoin) - safe_strcpy (sess->willjoinchannel, net->autojoin, - sizeof (sess->willjoinchannel)); + { + if (serv->autojoin) + free (serv->autojoin); + serv->autojoin = strdup (net->autojoin); + } } serv->password[0] = 0; @@ -969,7 +972,7 @@ servlist_load (void) { FILE *fp; - char buf[258]; + char buf[2048]; int len; char *tmp; ircnet *net = NULL; @@ -1174,3 +1177,80 @@ fclose (fp); return TRUE; } + +static void +joinlist_free1 (GSList *list) +{ + GSList *head = list; + + for (; list; list = list->next) + g_free (list->data); + g_slist_free (head); +} + +void +joinlist_free (GSList *channels, GSList *keys) +{ + joinlist_free1 (channels); + joinlist_free1 (keys); +} + +void +joinlist_split (char *autojoin, GSList **channels, GSList **keys) +{ + char *parta, *partb; + char *chan, *key; + int len; + + *channels = NULL; + *keys = NULL; + + /* after the first space, the keys begin */ + parta = autojoin; + partb = strchr (autojoin, ' '); + if (partb) + partb++; + + while (1) + { + chan = parta; + key = partb; + + if (1) + { + while (parta[0] != 0 && parta[0] != ',' && parta[0] != ' ') + { + parta++; + } + } + + if (partb) + { + while (partb[0] != 0 && partb[0] != ',' && partb[0] != ' ') + { + partb++; + } + } + + len = parta - chan; + if (len < 1) + break; + *channels = g_slist_append (*channels, g_strndup (chan, len)); + + len = partb - key; + *keys = g_slist_append (*keys, len ? g_strndup (key, len) : NULL); + + if (parta[0] == ' ' || parta[0] == 0) + break; + parta++; + + if (partb) + { + if (partb[0] == 0 || partb[0] == ' ') + partb = NULL; /* no more keys, but maybe more channels? */ + else + partb++; + } + } +} + Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/servlist.h =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/servlist.h 2011-09-13 09:45:40.121978521 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/servlist.h 2011-09-13 09:45:40.261978524 -0400 @@ -54,4 +54,7 @@ ircserver *servlist_server_add (ircnet *net, char *name); ircserver *servlist_server_find (ircnet *net, char *name, int *pos); +void joinlist_split (char *autojoin, GSList **channels, GSList **keys); +void joinlist_free (GSList *channels, GSList *keys); + #endif Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/xchat.h =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/xchat.h 2011-09-13 09:45:35.721978493 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/xchat.h 2011-09-13 09:45:40.261978524 -0400 @@ -395,6 +395,7 @@ void (*p_ns_identify)(struct server *, char *pass); void (*p_ns_ghost)(struct server *, char *usname, char *pass); void (*p_join)(struct server *, char *channel, char *key); + void (*p_join_list)(struct server *, GSList *channels, GSList *keys); void (*p_login)(struct server *, char *user, char *realname); void (*p_join_info)(struct server *, char *channel); void (*p_mode)(struct server *, char *target, char *mode); @@ -480,6 +481,7 @@ time_t away_time; /* when we were marked away */ char *encoding; /* NULL for system */ + char *autojoin; /* list of channels & keys to join */ int motd_skipped:1; unsigned int connected:1; debian/patches/116-remove-amiganet.patch0000664000000000000000000000161111770727100015226 0ustar Description: Remove defunct irc network. Author: Marc Deslauriers Forwarded: yes Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/848750 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=659028 Index: xchat-gnome-0.30.0~git20100421.29cc76/src/common/servlist.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/common/servlist.c 2011-09-13 18:01:23.202181014 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/common/servlist.c 2011-09-13 18:01:46.752181173 -0400 @@ -83,13 +83,6 @@ {0, "irc.5ci.net"}, {0, "irc.kis.lt"}, - {"AmigaNet", 0}, - {0, "irc.amiganet.org"}, - {0, "us.amiganet.org"}, - {0, "uk.amiganet.org"}, -/* {0, "no.amiganet.org"}, - {0, "au.amiganet.org"},*/ - {"ARCNet", 0}, {0, "se1.arcnet.vapor.com"}, {0, "us1.arcnet.vapor.com"}, debian/patches/106-ensure-an-empty-string-at-index-32-for-cmd_deop-etc.patch0000664000000000000000000000267511770727100023553 0ustar From 16b863bc4aed47ad06377f8a80b54538e3b59e9d Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 16:09:06 -0700 Subject: [PATCH 7/8] ensure an empty string at index 32 for cmd_deop etc Cherrypick of r1292 from xchat to fix bug reported at http://forum.xchat.org/viewtopic.php?p=15383#15383 --- src/common/outbound.c | 10 ++++++++-- 1 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/common/outbound.c b/src/common/outbound.c index 7c99c2f..19abe8e 100644 --- a/src/common/outbound.c +++ b/src/common/outbound.c @@ -4219,8 +4219,8 @@ handle_command (session *sess, char *cmd, int check_spch) struct popup *pop; int user_cmd = FALSE; GSList *list; - char *word[PDIWORDS]; - char *word_eol[PDIWORDS]; + char *word[PDIWORDS+1]; + char *word_eol[PDIWORDS+1]; static int command_level = 0; struct commands *int_cmd; char pdibuf_static[1024]; @@ -4251,6 +4251,12 @@ handle_command (session *sess, char *cmd, int check_spch) /* split the text into words and word_eol */ process_data_init (pdibuf, cmd, word, word_eol, TRUE, TRUE); + + /* ensure an empty string at index 32 for cmd_deop etc */ + /* (internal use only, plugins can still only read 1-31). */ + word[PDIWORDS] = "\000\000"; + word_eol[PDIWORDS] = "\000\000"; + int_cmd = find_internal_command (word[1]); /* redo it without quotes processing, for some commands like /JOIN */ if (int_cmd && !int_cmd->handle_quotes) -- 1.7.4.1 debian/patches/103-Add-chillfactory-irc-servers.patch0000664000000000000000000000136011770727100017556 0ustar From 69be6a138916cb61c8f8376a1f2aa8acf7ca6f6f Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 15:04:53 -0700 Subject: [PATCH 4/8] Add chillfactory irc servers (from Debian's xchat patch 01_serverlist.patch) --- src/common/servlist.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/common/servlist.c b/src/common/servlist.c index e568ccf..b1a4dc2 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -145,6 +145,9 @@ static const struct defaultserver def[] = {"ChatSpike", 0}, {0, "irc.chatspike.net"}, + {"ChillFactory", 0}, + {0, "irc.chillfactory.net"}, + {"CoolChat", 0}, {0, "irc.coolchat.net"}, /* {0, "unix.coolchat.net"}, -- 1.7.4.1 debian/patches/118-fix-net-monitor-reconnect.patch0000664000000000000000000000535211770727100017173 0ustar Description: Correctly reconnect after suspend and resume. Network Manager sends two NM_STATE_DISCONNECTED events when suspending, and the plugin was trying to save the list of network of channels twice. The second time through, the network was already disconnected, so it was saving an empty list. Author: Marc Deslauriers Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/855853 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=660019 Forwarded: yes Index: xchat-gnome-0.30.0~git20100421.29cc76/plugins/net-monitor/net-monitor.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/plugins/net-monitor/net-monitor.c 2011-09-21 15:34:09.300762733 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/plugins/net-monitor/net-monitor.c 2011-09-21 15:34:09.320762729 -0400 @@ -49,6 +49,7 @@ { NETWORK_UP, NETWORK_DOWN, + NETWORK_UNKNOWN } NetworkStatus; typedef enum @@ -73,6 +74,7 @@ static DBusConnection *bus; static GHashTable *networks = NULL; static GHashTable *channels = NULL; +static NetworkStatus network_mode = NETWORK_UNKNOWN; static int connected_cb (char *word[], gpointer data) @@ -187,13 +189,11 @@ DBusMessage *message, *reply; DBusMessageIter iter; DBusError error; - NetworkStatus network_mode = NETWORK_DOWN; message = dbus_message_new_method_call (NM_SERVICE, NM_OBJECT_PATH, NM_INTERFACE, "state"); if (message == NULL) { g_warning ("Net Monitor: Couldn't allocate dbus message : %s: %s\n", error.name, error.message); - /* just guess that we're up */ - set_network_mode (NETWORK_UP); + network_mode = NETWORK_UNKNOWN; return; } @@ -202,7 +202,7 @@ if (dbus_error_is_set (&error)) { g_warning ("Net Monitor: Error retrieving devices: %s: %s\n", error.name, error.message); - network_mode = NETWORK_UP; + network_mode = NETWORK_UNKNOWN; } else { dbus_message_iter_init (reply, &iter); if (dbus_message_iter_get_arg_type (&iter) == DBUS_TYPE_UINT32) { @@ -212,14 +212,15 @@ if (state == NM_STATE_CONNECTED_LOCAL || state == NM_STATE_CONNECTED_SITE || state == NM_STATE_CONNECTED_GLOBAL) { - network_mode = NETWORK_UP; - set_network_mode (network_mode); + if (network_mode != NETWORK_UP) { + network_mode = NETWORK_UP; + set_network_mode (network_mode); + } } else if (state == NM_STATE_DISCONNECTED ) { - network_mode = NETWORK_DOWN; - set_network_mode (network_mode); - } else { - g_warning ("Net Monitor: reply from NetworkManager not understood\n"); - network_mode = NETWORK_DOWN; + if (network_mode != NETWORK_DOWN) { + network_mode = NETWORK_DOWN; + set_network_mode (network_mode); + } } } } debian/patches/102-Drop-IPV6-servers.patch0000664000000000000000000000143111770727100015256 0ustar From b5fe90de8f063a02530449ad75d9ce372e49d142 Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 15:02:14 -0700 Subject: [PATCH 3/8] Drop IPV6 servers (See LP: #127616) --- src/common/servlist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/common/servlist.c b/src/common/servlist.c index eeef41e..e568ccf 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -62,12 +62,14 @@ static const struct defaultserver def[] = {0, "eu.afternet.org"}, {"Aitvaras", 0}, +/* See LP: #127616 #ifdef USE_IPV6 #ifdef USE_OPENSSL {0, "irc6.ktu.lt/+7668"}, #endif {0, "irc6.ktu.lt/7666"}, #endif +*/ #ifdef USE_OPENSSL {0, "irc.data.lt/+6668"}, {0, "irc-ssl.omnitel.net/+6668"}, -- 1.7.4.1 debian/patches/104-Don-t-crash-if-servlist-is-undefined.patch0000664000000000000000000000140111770727100021034 0ustar From 22a68d35417f92aeb323911ec579ebc87bb8f61b Mon Sep 17 00:00:00 2001 From: Bryce Harrington Date: Thu, 11 Aug 2011 15:33:33 -0700 Subject: [PATCH 5/8] Cherrypick xchat r1304. Don't crash if servlist is undefined. --- src/common/servlist.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/src/common/servlist.c b/src/common/servlist.c index b1a4dc2..e18642a 100644 --- a/src/common/servlist.c +++ b/src/common/servlist.c @@ -545,6 +545,8 @@ servlist_connect (session *sess, ircnet *net, gboolean join) list = g_slist_nth (net->servlist, net->selected); if (!list) list = net->servlist; + if (!list) + return; ircserv = list->data; /* incase a protocol switch is added to the servlist gui */ -- 1.7.4.1 debian/patches/115-fix-network-editor.patch0000664000000000000000000000471011770727100015711 0ustar Description: Fix network editor in preferences. Author: Marc Deslauriers Forwarded: yes Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/830756 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/811062 Bug: https://bugzilla.gnome.org/show_bug.cgi?id=654684 Index: xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/irc-network-editor.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/fe-gnome/irc-network-editor.c 2011-09-14 05:44:00.912468025 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/irc-network-editor.c 2011-09-14 05:44:06.702468061 -0400 @@ -303,6 +303,9 @@ g_object_unref (xml); + GtkWidget *content_area = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); + gtk_widget_reparent (dialog->toplevel, content_area); + dialog->server_store = gtk_list_store_new (1, G_TYPE_STRING); dialog->autojoin_store = gtk_list_store_new (2, G_TYPE_STRING, G_TYPE_STRING); dialog->server_renderer = gtk_cell_renderer_text_new (); @@ -338,7 +341,7 @@ gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_ACCEPT); gtk_container_set_border_width (GTK_CONTAINER (dialog), 6); - gtk_container_add (GTK_CONTAINER(GTK_DIALOG(dialog)->vbox), dialog->toplevel); + gtk_dialog_set_has_separator (GTK_DIALOG (dialog), FALSE); server_selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (dialog->servers)); Index: xchat-gnome-0.30.0~git20100421.29cc76/data/irc-network-editor.glade =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/data/irc-network-editor.glade 2011-09-14 05:44:11.862468098 -0400 +++ xchat-gnome-0.30.0~git20100421.29cc76/data/irc-network-editor.glade 2011-09-14 05:44:26.272468196 -0400 @@ -7,13 +7,13 @@ --> - True + False 5 GDK_WINDOW_TYPE_HINT_DIALOG False - True + False 2 debian/patches/10_xchat-gnome-close-event.patch0000664000000000000000000000246411770727100016604 0ustar diff -ru xchat-gnome-0.26.1.orig/src/fe-gnome/main-window.c xchat-gnome-0.26.1/src/fe-gnome/main-window.c --- xchat-gnome-0.26.1.orig/src/fe-gnome/main-window.c 2011-02-20 23:53:56.828151044 -0700 +++ xchat-gnome-0.26.1/src/fe-gnome/main-window.c 2011-02-20 23:55:04.386738750 -0700 @@ -48,8 +48,10 @@ #include "../common/xchatc.h" #include "../common/outbound.h" #include "../common/fe.h" +#include "../common/xchat-plugin.h" +#include "../common/plugin.h" -static void on_main_window_close (GtkWidget *widget, GdkEvent *event, gpointer data); +static gboolean on_main_window_close (GtkWidget *widget, GdkEvent *event, gpointer data); static void on_pgup (GtkAccelGroup *accelgroup, GObject *arg1, guint arg2, GdkModifierType arg3, gpointer data); static void on_pgdn (GtkAccelGroup *accelgroup, GObject *arg1, guint arg2, GdkModifierType arg3, gpointer data); @@ -323,15 +325,21 @@ g_object_unref (client); } -static void +static gboolean on_main_window_close (GtkWidget *widget, GdkEvent *event, gpointer data) { + session *s = gui.current_session; + int r = plugin_emit_dummy_print (s, "Close Main"); + if (r & XCHAT_EAT_XCHAT) { + return TRUE; + } save_main_window (); gui.quit = TRUE; gtk_widget_hide (GTK_WIDGET (gui.dcc)); userlist_gui_hide (); xchat_exit (); + return FALSE; } static void debian/patches/119-fix-null-channel-list-window.patch0000664000000000000000000000216411770727100017577 0ustar Description: fix null server name in channel list window Author: Marc Deslauriers Forwarded: yes Bug: https://bugzilla.gnome.org/show_bug.cgi?id=666056 Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xchat-gnome/+bug/903025 Index: xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/channel-list-window.c =================================================================== --- xchat-gnome-0.30.0~git20100421.29cc76.orig/src/fe-gnome/channel-list-window.c 2011-12-11 22:18:42.866645126 -0500 +++ xchat-gnome-0.30.0~git20100421.29cc76/src/fe-gnome/channel-list-window.c 2011-12-11 22:19:10.598644862 -0500 @@ -410,7 +410,7 @@ win->window = GTK_WIDGET (gtk_builder_get_object (win->xml, "channel_list_window")); - gchar *title = g_strdup_printf (_("%s Channel List"), server_get_network (sess->server, FALSE)); + gchar *title = g_strdup_printf (_("%s Channel List"), server_get_network (sess->server, TRUE)); gtk_window_set_title (GTK_WINDOW (win->window), title); g_free (title); g_signal_connect (G_OBJECT (win->window), "delete-event", G_CALLBACK (channel_list_window_delete_event), win); debian/patches/04_autojoin_ubuntu_chan.patch0000664000000000000000000000157111770727100016374 0ustar Index: xchat-gnome-0.26.1/src/common/servlist.c =================================================================== --- xchat-gnome-0.26.1.orig/src/common/servlist.c 2010-12-17 15:42:39.967712000 +1100 +++ xchat-gnome-0.26.1/src/common/servlist.c 2010-12-17 15:42:48.597712000 +1100 @@ -877,6 +877,17 @@ int i = 0, j = 0; ircnet *net = NULL; + /* Add the Ubuntu IRC Network */ + net = servlist_net_add ("Ubuntu Server", NULL, FALSE); + servlist_server_add (net, "irc.ubuntu.com/8001"); + /* translators: replace #ubuntu by the channel of your LoCo + team so users can have support in their native langage. + You can find a list of LoCo teams channels on: + https://wiki.ubuntu.com/UbuntuLiveChatSupport + If there is no such channel, just let #ubuntu */ + net->autojoin = strdup (_("#ubuntu")); + net->flags |= FLAG_AUTO_CONNECT; + while (1) { if (def[i].network) debian/patches/define_functions_fix_build.patch0000664000000000000000000000166312160575512017221 0ustar From fa86953132e7b9500430bd125276e755d963db01 Mon Sep 17 00:00:00 2001 From: Dominique Leuenberger Date: Wed, 17 Apr 2013 21:33:18 +0200 Subject: [PATCH] plugin/perl: add function prototypes. https://bugzilla.gnome.org/show_bug.cgi?id=698232 --- plugins/perl/perl.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/plugins/perl/perl.c b/plugins/perl/perl.c index 7de695a..fa44916 100644 --- a/plugins/perl/perl.c +++ b/plugins/perl/perl.c @@ -37,7 +37,9 @@ static xchat_plugin *ph; /* plugin handle */ static int perl_load_file (char *script_name); - +void xchat_plugin_get_info (char **plugin_name, char **plugin_desc, char **plugin_version, void **reserved); +int xchat_plugin_init (xchat_plugin *plugin_handle, char **plugin_name, char **plugin_desc, char **plugin_version, char *arg); +int xchat_plugin_deinit (xchat_plugin * plugin_handle); #ifdef WIN32 static DWORD -- debian/patches/98_ice_depends_for_eggsmclient.patch0000664000000000000000000000151211770727100017652 0ustar From: Mathieu Trudel-Lapierre Subject: Add a compile-time check for libICE, which is required by libsm. Adding a check for ice in configure (for EGG_SMCLIENT) makes sure ICE is added to EGG_SMCLIENT_CFLAGS, but more importantly to EGG_SMCLIENT_LIBS, so that linking has -lICE and doesn't bork. Index: xchat-gnome-0.26.1/configure.ac =================================================================== --- xchat-gnome-0.26.1.orig/configure.ac 2010-12-17 15:42:47.827712000 +1100 +++ xchat-gnome-0.26.1/configure.ac 2010-12-17 15:43:19.607712001 +1100 @@ -73,6 +73,7 @@ PKG_CHECK_MODULES([EGG_SMCLIENT], [\ gtk+-2.0 >= $GTK_REQUIRED \ sm >= $SM_REQUIRED \ + ice \ ]) AC_SUBST(EGG_SMCLIENT_CFLAGS) AC_SUBST(EGG_SMCLIENT_LIBS) debian/patches/95_apturl-support.patch0000664000000000000000000000321511770727100015201 0ustar Index: xchat-gnome-0.26.1/plugins/url_scraper/urlscraper.c =================================================================== --- xchat-gnome-0.26.1.orig/plugins/url_scraper/urlscraper.c 2010-12-17 15:18:38.000000000 +1100 +++ xchat-gnome-0.26.1/plugins/url_scraper/urlscraper.c 2010-12-17 15:43:06.437712000 +1100 @@ -12,7 +12,7 @@ #define PVERSION "0.2" -#define URLREGEX "(ht|f)tps?://[~a-z0-9./_=#%&?,-]+[a-z0-9]+" +#define URLREGEX "((ht|f)tps?://[~a-z0-9./_=#%&?,-]+[a-z0-9]+)|(apt:(//)?[a-z0-9][-+.a-z0-9]+)" #define EMAILREGEX "[a-z0-9.+_-]+@([0-9a-z-]+\\.)+[a-z]+" static xchat_plugin *ph; // Plugin handle. Index: xchat-gnome-0.26.1/src/common/url.c =================================================================== --- xchat-gnome-0.26.1.orig/src/common/url.c 2010-12-17 15:18:38.000000000 +1100 +++ xchat-gnome-0.26.1/src/common/url.c 2010-12-17 15:43:06.437712000 +1100 @@ -139,6 +139,7 @@ { D("file://") }, { D("rtsp://") }, { D("ut2004://") }, + { D("apt:") }, }, suffix[] = { { D(".org") }, Index: xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c =================================================================== --- xchat-gnome-0.26.1.orig/src/fe-gnome/fe-gnome.c 2010-12-17 15:43:00.947712000 +1100 +++ xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c 2010-12-17 15:43:06.437712000 +1100 @@ -966,7 +966,7 @@ GError *err = NULL; screen = gtk_widget_get_screen (gui.main_window); - if (strstr (url, "://") == NULL) { + if (strstr (url, "://") == NULL && strncmp (url, "apt:", 4) != 0) { gchar *newword = g_strdup_printf ("http://%s", url); gtk_show_uri (screen, newword, gtk_get_current_event_time (), &err); g_free (newword); debian/xchat-gnome-remote.10000664000000000000000000000166111770727100012763 0ustar .TH XCHAT-GNOME "1" "April 2006" "xchat-gnome 0.10" "User Commands" .SH NAME xchat-gnome-remote \- tells a running xchat-gnome to perform tasks via dbus .SH DESCRIPTION .PP This is a manual page written for Debian because the original package doesn't have one. For further reference, check the \fBSEE ALSO\fR section. .SS "Usage:" .IP xchat\-gnome\-remote [OPTION...] .SS "Options:" \fB\-u\fR, \fB\-\-url\fR=\fIirc\fR://server:port/channel Open an irc:// url .TP \fB\-c\fR, \fB\-\-command\fR=\fcommand\fR Execute a xchat command .TP \fB\-p\fR, \fB\-\-print\fR=\ftext\fR Prints some text to the current tab/window .TP \fB\-s\fR, \fB\-\-channel\fR=\fchannel\fR Change the context to the channel .TP \fB\-s\fR, \fB\-\-server\fR=\fserver\fR Change the context to the server .TP \fB\-i\fR, \fB\-\-info\fR=\fid\fR Get some informations from xchat .TP \fB\-r\fR, \fB\-\-prefs\fR=\fname\fR Get settings from xchat .TP .SH "SEE ALSO" .BR xchat-gnome (1) debian/xchat-gnome.install0000664000000000000000000000014111770727100012770 0ustar debian/tmp/usr/bin debian/tmp/usr/lib debian/tmp/usr/share/man debian/tmp/usr/share/applications debian/xchat-gnome.menu0000664000000000000000000000023611770727100012273 0ustar ?package(xchat-gnome):needs="X11" \ section="Applications/Network/Communication/" \ hints="Gnome" title="X-Chat GNOME" \ command="/usr/bin/xchat-gnome" debian/copyright0000664000000000000000000000547411770727100011137 0ustar This package was debianized by Sebastien Bacher on Sun, 24 Jul 2005 14:17:00 +0200. This package was re-debianized by Marco Cabizza on Sun, 3 Apr 2006 18:07:47 +0200. It was downloaded from: Copyright © 2004-2008: Andre Dahlqvist Bastien Nocera Brian Pepple Christian Persch Dan Kuester Daniel Drake David Trowbridge Evan Sheehan Guillaume Desmottes Isak Savo Luis Villa Peter Železný Ramón Rey Vicente Rouslan Solomakhin Xavier Claessens License: This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, with the additional exemption that compiling, linking, and/or using OpenSSL is allowed. You may provide binary packages linked to the OpenSSL libraries, provided that all other requirements of the GPL are met. This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. On Debian systems, the complete text of the GNU General Public License can be found in `/usr/share/common-licenses/GPL'. Files: src/libcontrast/contrast.* Copyright: Copyright 2006-2007 David Trowbridge License: MIT Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to dea in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. debian/watch0000664000000000000000000000016011770727100010220 0ustar version=3 http://ftp.gnome.org/pub/GNOME/sources/xchat-gnome/([\d\.]+)[02468]/ \ xchat-gnome-([\d\.]+)\.tar\.gz debian/xchat-gnome.manpages0000664000000000000000000000005711770727100013123 0ustar debian/xchat-gnome-remote.1 data/xchat-gnome.1 debian/rules0000775000000000000000000000134712256660366010271 0ustar #!/usr/bin/make -f include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/utils.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk DEB_CONFIGURE_EXTRA_FLAGS += --disable-scrollkeeper LDFLAGS += -Wl,--as-needed binary-install/xchat-gnome:: find debian/ -name "*.la" -exec rm -f {} \; find debian/ -name "*.a" -exec rm -f {} \; post-patches:: intltoolize -f -c binary-install/xchat-gnome-common:: find debian/ -name "xchat-gnome.1" -exec rm -f {} \; rm -rf debian/xchat-gnome-common/usr/share/man rm -rf debian/xchat-gnome-common/usr/share/applications