From 5184e0d2442580f165d6b04413a69b5ba32596f8 Mon Sep 17 00:00:00 2001 From: Debarshi Ray Date: Tue, 27 Nov 2012 16:23:36 +0100 Subject: [PATCH] Make sure default settings work with gnome-shell (#880672) --- ...t-2.8.4-disable-tray-icon-by-default.patch | 12 -------- xchat-2.8.8-notifications-and-tray.patch | 30 +++++++++++++++++++ xchat.spec | 9 ++++-- 3 files changed, 36 insertions(+), 15 deletions(-) delete mode 100644 xchat-2.8.4-disable-tray-icon-by-default.patch create mode 100644 xchat-2.8.8-notifications-and-tray.patch diff --git a/xchat-2.8.4-disable-tray-icon-by-default.patch b/xchat-2.8.4-disable-tray-icon-by-default.patch deleted file mode 100644 index 5466815..0000000 --- a/xchat-2.8.4-disable-tray-icon-by-default.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur xchat-2.8.4/src/common/cfgfiles.c xchat-2.8.4-disable-tray-icon-by-default/src/common/cfgfiles.c ---- xchat-2.8.4/src/common/cfgfiles.c 2007-06-17 08:11:42.000000000 +0200 -+++ xchat-2.8.4-disable-tray-icon-by-default/src/common/cfgfiles.c 2007-07-04 12:05:21.000000000 +0200 -@@ -670,7 +670,7 @@ - prefs.autoopendccchatwindow = 1; - prefs.userhost = 1; - prefs.gui_url_mod = 4; /* ctrl */ -- prefs.gui_tray = 1; -+ prefs.gui_tray = 0; - prefs.gui_pane_left_size = 100; - prefs.gui_pane_right_size = 100; - prefs.mainwindow_save = 1; diff --git a/xchat-2.8.8-notifications-and-tray.patch b/xchat-2.8.8-notifications-and-tray.patch new file mode 100644 index 0000000..0803ce2 --- /dev/null +++ b/xchat-2.8.8-notifications-and-tray.patch @@ -0,0 +1,30 @@ +diff -urNp xchat-2.8.8/src/common/cfgfiles.c xchat-2.8.8-notifications-and-tray/src/common/cfgfiles.c +--- xchat-2.8.8/src/common/cfgfiles.c 2009-08-16 11:40:16.000000000 +0200 ++++ xchat-2.8.8-notifications-and-tray/src/common/cfgfiles.c 2012-11-27 15:34:13.080403744 +0100 +@@ -670,11 +670,13 @@ load_config (void) + prefs.autoopendccchatwindow = 1; + prefs.userhost = 1; + prefs.gui_url_mod = 4; /* ctrl */ +- prefs.gui_tray = 1; ++ prefs.gui_tray = 0; + prefs.gui_pane_left_size = 100; + prefs.gui_pane_right_size = 100; + prefs.mainwindow_save = 1; + prefs.bantype = 2; ++ prefs.input_balloon_hilight = 1; ++ prefs.input_balloon_priv = 1; + prefs.input_balloon_time = 20; + prefs.input_flash_priv = prefs.input_flash_hilight = 1; + prefs.input_tray_priv = prefs.input_tray_hilight = 1; +diff -urNp xchat-2.8.8/src/fe-gtk/maingui.c xchat-2.8.8-notifications-and-tray/src/fe-gtk/maingui.c +--- xchat-2.8.8/src/fe-gtk/maingui.c 2010-05-16 05:15:55.000000000 +0200 ++++ xchat-2.8.8-notifications-and-tray/src/fe-gtk/maingui.c 2012-11-27 16:05:27.609518192 +0100 +@@ -3107,7 +3107,7 @@ mg_tabwindow_de_cb (GtkWidget *widget, G + list = list->next; + } + +- mg_open_quit_dialog (TRUE); ++ mg_open_quit_dialog (FALSE); + return TRUE; + } + diff --git a/xchat.spec b/xchat.spec index ad2f238..8e719c9 100644 --- a/xchat.spec +++ b/xchat.spec @@ -4,7 +4,7 @@ Summary: A popular and easy to use graphical IRC (chat) client Name: xchat Version: 2.8.8 -Release: 15%{?dist} +Release: 16%{?dist} Epoch: 1 Group: Applications/Internet License: GPLv2+ @@ -15,8 +15,8 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) # Patches 0-9 reserved for official xchat.org patches Patch12: xchat-1.8.7-use-sysconf-to-detect-cpus.patch -# see #241923 -Patch35: xchat-2.8.4-disable-tray-icon-by-default.patch +# see #241923 & #880672 +Patch35: xchat-2.8.8-notifications-and-tray.patch # Upstream XChat 2.8.6 defaults to Latin1 (what upstream calls the "IRC" # encoding). Default to UTF-8 instead (as previous versions did, at least when # running under a UTF-8 locale). @@ -187,6 +187,9 @@ fi %{_libdir}/xchat/plugins/tcl.so %changelog +* Tue Nov 27 2012 Debarshi Ray - 1:2.8.8-16 +- Make sure default settings work with gnome-shell (#880672) + * Sun Jul 22 2012 Fedora Release Engineering - 1:2.8.8-15 - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild