From fe8828ed65c0f8796d36b352f6a8458d293714a3 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 06 2019 10:59:30 +0000
Subject: import xchat-2.8.8-24.el7


---

diff --git a/SOURCES/xchat-2.8.8-restore-status-icon.patch b/SOURCES/xchat-2.8.8-restore-status-icon.patch
new file mode 100644
index 0000000..10d3d70
--- /dev/null
+++ b/SOURCES/xchat-2.8.8-restore-status-icon.patch
@@ -0,0 +1,61 @@
+diff -urNp xchat-2.8.8/src/fe-gtk/plugin-tray.c xchat-2.8.8-restore-status-icon/src/fe-gtk/plugin-tray.c
+--- xchat-2.8.8/src/fe-gtk/plugin-tray.c	2010-05-16 03:37:01.000000000 +0200
++++ xchat-2.8.8-restore-status-icon/src/fe-gtk/plugin-tray.c	2019-03-20 18:51:30.837752123 +0100
+@@ -55,9 +55,13 @@ static int tray_priv_count = 0;
+ static int tray_pub_count = 0;
+ static int tray_hilight_count = 0;
+ static int tray_file_count = 0;
++static int tray_restore_timer = 0;
+ 
+ 
+ void tray_apply_setup (void);
++static gboolean tray_menu_try_restore (void);
++static void tray_cleanup (void);
++static void tray_init (void);
+ 
+ 
+ static WinStatus
+@@ -487,6 +491,34 @@ tray_menu_restore_cb (GtkWidget *item, g
+ }
+ 
+ static void
++tray_menu_notify_cb (GObject *tray, GParamSpec *pspec, gpointer user_data)
++{
++	if (sticon)
++	{
++		if (!gtk_status_icon_is_embedded (sticon))
++		{
++			tray_restore_timer = g_timeout_add (500, (GSourceFunc)tray_menu_try_restore, NULL);
++		}
++		else
++		{
++			if (tray_restore_timer)
++			{
++				g_source_remove (tray_restore_timer);
++				tray_restore_timer = 0;
++			}
++		}
++	}
++}
++
++static gboolean
++tray_menu_try_restore (void)
++{
++	tray_cleanup ();
++	tray_init ();
++	return TRUE;
++}
++
++static void
+ tray_menu_quit_cb (GtkWidget *item, gpointer userdata)
+ {
+ 	mg_open_quit_dialog (FALSE);
+@@ -636,6 +668,8 @@ tray_init (void)
+ 							G_CALLBACK (tray_menu_cb), sticon);
+ 	g_signal_connect (G_OBJECT (sticon), "activate",
+ 							G_CALLBACK (tray_menu_restore_cb), NULL);
++	g_signal_connect (G_OBJECT (sticon), "notify_embedded",
++							G_CALLBACK (tray_menu_notify_cb), NULL);
+ }
+ 
+ static int
diff --git a/SPECS/xchat.spec b/SPECS/xchat.spec
index dc9301a..993abf4 100644
--- a/SPECS/xchat.spec
+++ b/SPECS/xchat.spec
@@ -3,7 +3,7 @@
 Summary:   A popular and easy to use graphical IRC (chat) client
 Name:      xchat
 Version:   2.8.8
-Release:   23%{?dist}
+Release:   24%{?dist}
 Epoch:     1
 Group:     Applications/Internet
 License:   GPLv2+
@@ -53,6 +53,8 @@ Patch56: xchat-2.8.8-xdg-dirs.patch
 Patch57: xchat-2.8.8-desktop-file-name.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1091544
 Patch58: 0001-Don-t-force-the-use-of-SSLv3.patch
+# https://bugzilla.redhat.com/show_bug.cgi?id=1544840
+Patch59: xchat-2.8.8-restore-status-icon.patch
 
 BuildRequires: perl perl(ExtUtils::Embed) python-devel openssl-devel pkgconfig, tcl-devel
 BuildRequires: GConf2-devel
@@ -115,6 +117,7 @@ This package contains the X-Chat plugin providing the Tcl scripting interface.
 %patch56 -p1 -b .xdg-dirs
 %patch57 -p1 -b .desktop-file-name
 %patch58 -p1 -b .allow-tls
+%patch59 -p1 -b .restore-status-icon
 
 sed -i -e 's/#define GTK_DISABLE_DEPRECATED//g' src/fe-gtk/*.c
 
@@ -216,7 +219,11 @@ fi
 %{_libdir}/xchat/plugins/tcl.so
 
 %changelog
-* Mon May 18 2014 Debarshi Ray <rishi@fedoraproject.org> - 1:2.8.8-23
+* Wed Mar 20 2019 Debarshi Ray <rishi@fedoraproject.org> - 1:2.8.8-24
+- Restore the status icon after resuming from suspend
+Resolves: #1544840
+
+* Mon May 18 2015 Debarshi Ray <rishi@fedoraproject.org> - 1:2.8.8-23
 - Do not force SSLv3, also allow TLSv1_X
 Resolves: #1198317