Compare commits
5 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
8d15702c9a | ||
|
|
f18f84682a | ||
|
|
31765ea5d2 | ||
|
|
07e3616a6c | ||
|
|
e50008078a |
12 changed files with 884 additions and 3 deletions
1
.gitignore
vendored
Normal file
1
.gitignore
vendored
Normal file
|
|
@ -0,0 +1 @@
|
|||
xchat-gnome-0.26.1.tar.bz2
|
||||
35
0001-Added-port-numbers-for-Freenode.patch
Normal file
35
0001-Added-port-numbers-for-Freenode.patch
Normal file
|
|
@ -0,0 +1,35 @@
|
|||
From bc98c28e891408145bed2b18d3c02adbadadde31 Mon Sep 17 00:00:00 2001
|
||||
From: Debarshi Ray <debarshir@src.gnome.org>
|
||||
Date: Sat, 30 Jan 2010 13:05:21 +0200
|
||||
Subject: [PATCH] Added port numbers for Freenode
|
||||
|
||||
http://freenode.net/irc_servers.shtml
|
||||
---
|
||||
src/common/servlist.c | 11 ++++++++++-
|
||||
1 files changed, 10 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/common/servlist.c b/src/common/servlist.c
|
||||
index c6839e0..3082966 100644
|
||||
--- a/src/common/servlist.c
|
||||
+++ b/src/common/servlist.c
|
||||
@@ -207,7 +207,16 @@ static const struct defaultserver def[] =
|
||||
{0, "irc.vendetta.com"},
|
||||
|
||||
{"FreeNode", 0},
|
||||
- {0, "irc.freenode.net"},
|
||||
+ {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"},
|
||||
+#ifdef USE_OPENSSL
|
||||
+ {0, "irc.freenode.net/+7000"},
|
||||
+ {0, "irc.freenode.net/+7070"},
|
||||
+#endif
|
||||
|
||||
/* {"Freeworld", 0},
|
||||
{0, "kabel.freeworld.nu"},
|
||||
--
|
||||
1.6.6
|
||||
|
||||
37
0001-Fix-DCC-transfer-timeouts-when-dcc_auto_send-2.patch
Normal file
37
0001-Fix-DCC-transfer-timeouts-when-dcc_auto_send-2.patch
Normal file
|
|
@ -0,0 +1,37 @@
|
|||
From 48af97ebe635389c8f176cc2ea5f9151474ca3eb Mon Sep 17 00:00:00 2001
|
||||
From: Adam Buchbinder <adam.buchbinder@gmail.com>
|
||||
Date: Tue, 27 Oct 2009 11:04:00 -0400
|
||||
Subject: [PATCH] Fix DCC transfer timeouts when dcc_auto_send == 2.
|
||||
|
||||
The default in xchat2 is to set dcc_auto_send to 2, which means
|
||||
"browse for a download directory". However, xchat-gnome only uses
|
||||
the values 0 and 1, and when the default is provided (inherited
|
||||
from xchat2), the transfer simply waits for a confirmation popup
|
||||
which never appears.
|
||||
|
||||
The fix here is to make the default act the same as "0"; the user
|
||||
will be prompted as to whether or not they want to save the file.
|
||||
|
||||
This closes bug 599781.
|
||||
|
||||
Signed-off-by: Adam Buchbinder <adam.buchbinder@gmail.com>
|
||||
---
|
||||
src/fe-gnome/dcc-window.c | 2 +-
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/src/fe-gnome/dcc-window.c b/src/fe-gnome/dcc-window.c
|
||||
index 463a974..92f2026 100644
|
||||
--- a/src/fe-gnome/dcc-window.c
|
||||
+++ b/src/fe-gnome/dcc-window.c
|
||||
@@ -207,7 +207,7 @@ dcc_window_add (DccWindow *window, struct DCC *dcc)
|
||||
|
||||
/* If this is a recieve and auto-accept isn't turned on, pop up a
|
||||
* confirmation dialog */
|
||||
- if ((dcc->type == TYPE_RECV) && (dcc->dccstat == STAT_QUEUED) && (prefs.autodccsend == FALSE)) {
|
||||
+ if ((dcc->type == TYPE_RECV) && (dcc->dccstat == STAT_QUEUED) && (prefs.autodccsend != 1)) {
|
||||
GtkWidget *dialog;
|
||||
gint response;
|
||||
|
||||
--
|
||||
1.6.0.4
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
2016-11-20: Retired orphaned package, because it was orphaned for
|
||||
more than six weeks.
|
||||
|
||||
1
sources
Normal file
1
sources
Normal file
|
|
@ -0,0 +1 @@
|
|||
c9ce3d6e549736edfc1a1dc0282fb363 xchat-gnome-0.26.1.tar.bz2
|
||||
22
status_fix.patch
Normal file
22
status_fix.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
From ac131cab5e5429525aed592b504bae9d6ee92069 Mon Sep 17 00:00:00 2001
|
||||
From: Ritesh Khadgaray <khadgaray@gmail.com>
|
||||
Date: Fri, 15 Jan 2010 07:37:40 +0000
|
||||
Subject: Bug 592491 - xchat-gnome crashed with SIGSEGV in handle_command(
|
||||
|
||||
fixed a regression. Was unable to set status "back".
|
||||
---
|
||||
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
|
||||
index a47f710..cc13892 100644
|
||||
--- a/src/common/proto-irc.c
|
||||
+++ b/src/common/proto-irc.c
|
||||
@@ -114,7 +114,7 @@ irc_quit (server *serv, char *reason)
|
||||
static void
|
||||
irc_set_back (server *serv)
|
||||
{
|
||||
- tcp_send_len (serv, "BACK\r\n", 6);
|
||||
+ tcp_send_len (serv, "AWAY\r\n", 6);
|
||||
}
|
||||
|
||||
static void
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
78
xchat-gnome-0.23.92-config.patch
Normal file
78
xchat-gnome-0.23.92-config.patch
Normal file
|
|
@ -0,0 +1,78 @@
|
|||
diff -urp xchat-gnome-0.23.92.OLD/plugins/perl/perl.c xchat-gnome-0.23.92/plugins/perl/perl.c
|
||||
--- xchat-gnome-0.23.92.OLD/plugins/perl/perl.c 2007-03-09 10:42:50.000000000 -0500
|
||||
+++ xchat-gnome-0.23.92/plugins/perl/perl.c 2008-09-09 19:07:08.000000000 -0400
|
||||
@@ -92,7 +92,7 @@ perl_auto_load (void)
|
||||
if (!xdir) /* xchatdirfs is new for 2.0.9, will fail on older */
|
||||
xdir = xchat_get_info (ph, "xchatdir");
|
||||
|
||||
- /* autoload from ~/.xchat2/ or ${APPDATA}\X-Chat 2\ on win32 */
|
||||
+ /* autoload from ~/.xchat-gnome/ or ${APPDATA}\X-Chat 2\ on win32 */
|
||||
perl_auto_load_from_path (xdir);
|
||||
|
||||
#ifdef WIN32
|
||||
diff -urp xchat-gnome-0.23.92.OLD/plugins/python/python.c xchat-gnome-0.23.92/plugins/python/python.c
|
||||
--- xchat-gnome-0.23.92.OLD/plugins/python/python.c 2008-09-07 09:18:27.000000000 -0400
|
||||
+++ xchat-gnome-0.23.92/plugins/python/python.c 2008-09-09 19:06:47.000000000 -0400
|
||||
@@ -421,7 +421,7 @@ Util_Expand(char *filename)
|
||||
return expanded;
|
||||
g_free(expanded);
|
||||
|
||||
- /* Check if ~/.xchat2/<filename> exists. */
|
||||
+ /* Check if ~/.xchat-gnome/<filename> exists. */
|
||||
expanded = g_build_filename(xchat_get_info(ph, "xchatdir"),
|
||||
filename, NULL);
|
||||
if (g_file_test(expanded, G_FILE_TEST_EXISTS))
|
||||
diff -urp xchat-gnome-0.23.92.OLD/src/common/cfgfiles.c xchat-gnome-0.23.92/src/common/cfgfiles.c
|
||||
--- xchat-gnome-0.23.92.OLD/src/common/cfgfiles.c 2007-09-12 10:12:26.000000000 -0400
|
||||
+++ xchat-gnome-0.23.92/src/common/cfgfiles.c 2008-09-09 19:05:01.000000000 -0400
|
||||
@@ -34,7 +34,7 @@
|
||||
#ifdef WIN32
|
||||
#define XCHAT_DIR "X-Chat 2"
|
||||
#else
|
||||
-#define XCHAT_DIR ".xchat2"
|
||||
+#define XCHAT_DIR ".xchat-gnome"
|
||||
#endif
|
||||
#define DEF_FONT "Monospace 9"
|
||||
|
||||
@@ -351,7 +351,7 @@ check_prefs_dir (void)
|
||||
#else
|
||||
if (mkdir (dir, S_IRUSR | S_IWUSR | S_IXUSR) != 0)
|
||||
#endif
|
||||
- fe_message (_("Cannot create ~/.xchat2"), FE_MSG_ERROR);
|
||||
+ fe_message (_("Cannot create ~/.xchat-gnome"), FE_MSG_ERROR);
|
||||
}
|
||||
}
|
||||
|
||||
diff -urp xchat-gnome-0.23.92.OLD/src/common/fe.h xchat-gnome-0.23.92/src/common/fe.h
|
||||
--- xchat-gnome-0.23.92.OLD/src/common/fe.h 2007-07-09 05:30:58.000000000 -0400
|
||||
+++ xchat-gnome-0.23.92/src/common/fe.h 2008-09-09 19:05:21.000000000 -0400
|
||||
@@ -106,7 +106,7 @@ void fe_get_str (char *prompt, char *def
|
||||
void fe_get_int (char *prompt, int def, void *callback, void *ud);
|
||||
#define FRF_WRITE 1 /* save file */
|
||||
#define FRF_MULTIPLE 2 /* multi-select */
|
||||
-#define FRF_ADDFOLDER 4 /* add ~/.xchat2 to favourites */
|
||||
+#define FRF_ADDFOLDER 4 /* add ~/.xchat-gnome to favourites */
|
||||
#define FRF_CHOOSEFOLDER 8 /* choosing a folder only */
|
||||
#define FRF_FILTERISINITIAL 16 /* unused */
|
||||
#define FRF_NOASKOVERWRITE 32 /* don't ask to overwrite existing files */
|
||||
diff -urp xchat-gnome-0.23.92.OLD/src/fe-gnome/preferences-page-plugins.c xchat-gnome-0.23.92/src/fe-gnome/preferences-page-plugins.c
|
||||
--- xchat-gnome-0.23.92.OLD/src/fe-gnome/preferences-page-plugins.c 2007-07-24 05:24:39.000000000 -0400
|
||||
+++ xchat-gnome-0.23.92/src/fe-gnome/preferences-page-plugins.c 2008-09-09 19:06:27.000000000 -0400
|
||||
@@ -242,7 +242,7 @@ open_plugin_clicked (GtkButton *button,
|
||||
file_selector = gtk_file_chooser_dialog_new (_("Open Plugin"), NULL, GTK_FILE_CHOOSER_ACTION_OPEN, GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL);
|
||||
|
||||
homedir = g_get_home_dir();
|
||||
- plugindir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
|
||||
+ plugindir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
|
||||
gtk_file_chooser_set_filename (GTK_FILE_CHOOSER (file_selector), plugindir);
|
||||
g_free (plugindir);
|
||||
|
||||
@@ -417,7 +417,7 @@ preferences_page_plugins_check_plugins (
|
||||
xchat_plugin *plugin;
|
||||
|
||||
homedir = g_get_home_dir ();
|
||||
- xchatdir = g_strdup_printf ("%s/.xchat2/plugins", homedir);
|
||||
+ xchatdir = g_strdup_printf ("%s/.xchat-gnome/plugins", homedir);
|
||||
for_files (XCHATLIBDIR "/plugins", "*.so", fe_plugin_add);
|
||||
for_files (XCHATLIBDIR "/plugins", "*.sl", fe_plugin_add);
|
||||
for_files (XCHATLIBDIR "/plugins", "*.py", fe_plugin_add);
|
||||
44
xchat-gnome-DSOLink.patch
Normal file
44
xchat-gnome-DSOLink.patch
Normal file
|
|
@ -0,0 +1,44 @@
|
|||
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.am xchat-gnome-0.26.1/src/fe-gnome/Makefile.am
|
||||
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.am 2007-04-24 18:43:05.000000000 -0400
|
||||
+++ xchat-gnome-0.26.1/src/fe-gnome/Makefile.am 2010-03-07 15:45:35.667276790 -0500
|
||||
@@ -113,6 +113,7 @@ xchat_gnome_CFLAGS = \
|
||||
$(AM_CFLAGS)
|
||||
|
||||
xchat_gnome_LDFLAGS = \
|
||||
+ -lX11 \
|
||||
-export-dynamic \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.in xchat-gnome-0.26.1/src/fe-gnome/Makefile.in
|
||||
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/Makefile.in 2009-04-12 13:48:06.000000000 -0400
|
||||
+++ xchat-gnome-0.26.1/src/fe-gnome/Makefile.in 2010-03-07 15:45:55.309526635 -0500
|
||||
@@ -449,6 +449,7 @@ xchat_gnome_CFLAGS = \
|
||||
$(AM_CFLAGS)
|
||||
|
||||
xchat_gnome_LDFLAGS = \
|
||||
+ -lX11 \
|
||||
-export-dynamic \
|
||||
$(AM_LDFLAGS)
|
||||
|
||||
diff -urp xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.am xchat-gnome-0.26.1/src/libcontrast/Makefile.am
|
||||
--- xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.am 2007-04-24 18:43:04.000000000 -0400
|
||||
+++ xchat-gnome-0.26.1/src/libcontrast/Makefile.am 2010-03-07 15:56:15.164278726 -0500
|
||||
@@ -12,6 +12,7 @@ libcontrast_la_CFLAGS = \
|
||||
$(AM_CFLAGS)
|
||||
|
||||
libcontrast_la_LDFLAGS = \
|
||||
+ -lm \
|
||||
$(AM_LDFLAGS) \
|
||||
-static
|
||||
|
||||
diff -urp xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.in xchat-gnome-0.26.1/src/libcontrast/Makefile.in
|
||||
--- xchat-gnome-0.26.1.OLD/src/libcontrast/Makefile.in 2009-04-12 13:48:06.000000000 -0400
|
||||
+++ xchat-gnome-0.26.1/src/libcontrast/Makefile.in 2010-03-07 15:56:35.529527068 -0500
|
||||
@@ -297,6 +297,7 @@ libcontrast_la_CFLAGS = \
|
||||
$(AM_CFLAGS)
|
||||
|
||||
libcontrast_la_LDFLAGS = \
|
||||
+ -lm \
|
||||
$(AM_LDFLAGS) \
|
||||
-static
|
||||
|
||||
103
xchat-gnome-crasher.patch
Normal file
103
xchat-gnome-crasher.patch
Normal file
|
|
@ -0,0 +1,103 @@
|
|||
From 1418579a815af27190b56ac3595ec8bae5b71647 Mon Sep 17 00:00:00 2001
|
||||
From: Ritesh Khadgaray <khadgaray@gmail.com>
|
||||
Date: Wed, 13 Jan 2010 17:26:02 +0000
|
||||
Subject: Bug 592491 - xchat-gnome crashed with SIGSEGV in handle_command(
|
||||
|
||||
Probable fix. This should also fix
|
||||
rh bug 550662 - [abrt] crash detected in xchat-gnome-0.26.1-5.fc12
|
||||
---
|
||||
diff --git a/src/common/proto-irc.c b/src/common/proto-irc.c
|
||||
index f1ab1a8..a47f710 100644
|
||||
--- a/src/common/proto-irc.c
|
||||
+++ b/src/common/proto-irc.c
|
||||
@@ -44,7 +44,7 @@
|
||||
static void
|
||||
irc_login (server *serv, char *user, char *realname)
|
||||
{
|
||||
- if (serv->password[0])
|
||||
+ if (serv->password)
|
||||
tcp_sendf (serv, "PASS %s\r\n", serv->password);
|
||||
|
||||
tcp_sendf (serv,
|
||||
@@ -87,7 +87,7 @@ irc_ns_ghost (server *serv, char *usname, char *pass)
|
||||
static void
|
||||
irc_join (server *serv, char *channel, char *key)
|
||||
{
|
||||
- if (key[0])
|
||||
+ if (key)
|
||||
tcp_sendf (serv, "JOIN %s %s\r\n", channel, key);
|
||||
else
|
||||
tcp_sendf (serv, "JOIN %s\r\n", channel);
|
||||
@@ -96,7 +96,7 @@ irc_join (server *serv, char *channel, char *key)
|
||||
static void
|
||||
irc_part (server *serv, char *channel, char *reason)
|
||||
{
|
||||
- if (reason[0])
|
||||
+ if (reason)
|
||||
tcp_sendf (serv, "PART %s :%s\r\n", channel, reason);
|
||||
else
|
||||
tcp_sendf (serv, "PART %s\r\n", channel);
|
||||
@@ -105,7 +105,7 @@ irc_part (server *serv, char *channel, char *reason)
|
||||
static void
|
||||
irc_quit (server *serv, char *reason)
|
||||
{
|
||||
- if (reason[0])
|
||||
+ if (reason)
|
||||
tcp_sendf (serv, "QUIT :%s\r\n", reason);
|
||||
else
|
||||
tcp_send_len (serv, "QUIT\r\n", 6);
|
||||
@@ -114,15 +114,16 @@ irc_quit (server *serv, char *reason)
|
||||
static void
|
||||
irc_set_back (server *serv)
|
||||
{
|
||||
- tcp_send_len (serv, "AWAY\r\n", 6);
|
||||
+ tcp_send_len (serv, "BACK\r\n", 6);
|
||||
}
|
||||
|
||||
static void
|
||||
irc_set_away (server *serv, char *reason)
|
||||
{
|
||||
- if (!reason[0])
|
||||
- reason = " ";
|
||||
- tcp_sendf (serv, "AWAY :%s\r\n", reason);
|
||||
+ if (reason)
|
||||
+ tcp_sendf (serv, "AWAY :%s\r\n", reason);
|
||||
+ else
|
||||
+ tcp_send_len (serv, "AWAY", 6);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -146,7 +147,7 @@ irc_cycle (server *serv, char *channel, char *key)
|
||||
static void
|
||||
irc_kick (server *serv, char *channel, char *nick, char *reason)
|
||||
{
|
||||
- if (reason[0])
|
||||
+ if (reason)
|
||||
tcp_sendf (serv, "KICK %s %s :%s\r\n", channel, nick, reason);
|
||||
else
|
||||
tcp_sendf (serv, "KICK %s %s\r\n", channel, nick);
|
||||
@@ -235,18 +236,16 @@ irc_notice (server *serv, char *channel, char *text)
|
||||
static void
|
||||
irc_topic (server *serv, char *channel, char *topic)
|
||||
{
|
||||
- if (!topic)
|
||||
- tcp_sendf (serv, "TOPIC %s :\r\n", channel);
|
||||
- else if (topic[0])
|
||||
- tcp_sendf (serv, "TOPIC %s :%s\r\n", channel, topic);
|
||||
+ if (topic)
|
||||
+ tcp_sendf (serv, "TOPIC %s :%s\r\n", channel, topic);
|
||||
else
|
||||
- tcp_sendf (serv, "TOPIC %s\r\n", channel);
|
||||
+ tcp_sendf (serv, "TOPIC %s :\r\n", channel);
|
||||
}
|
||||
|
||||
static void
|
||||
irc_list_channels (server *serv, char *arg, int min_users)
|
||||
{
|
||||
- if (arg[0])
|
||||
+ if (arg)
|
||||
{
|
||||
tcp_sendf (serv, "LIST %s\r\n", arg);
|
||||
return;
|
||||
--
|
||||
cgit v0.8.3.1
|
||||
406
xchat-gnome.spec
Normal file
406
xchat-gnome.spec
Normal file
|
|
@ -0,0 +1,406 @@
|
|||
Name: xchat-gnome
|
||||
Version: 0.26.1
|
||||
Release: 11%{?dist}
|
||||
Summary: GNOME front-end to xchat
|
||||
|
||||
Group: Applications/Internet
|
||||
License: GPLv2+
|
||||
URL: http://%{name}.navi.cx/
|
||||
Source0: http://ftp.acc.umu.se/pub/gnome/sources/%{name}/0.26/%{name}-%{version}.tar.bz2
|
||||
# Patch specific to Fedora to use .xchat-gnome, instead of .xchat2
|
||||
Patch0: %{name}-0.23.92-config.patch
|
||||
# Patch to fix pressing "enter" in the middle of editing channel topic.
|
||||
# RH Bug #483839
|
||||
Patch1: xchat-topic-update.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=550662
|
||||
Patch2: %{name}-crasher.patch
|
||||
# http://git.gnome.org/browse/xchat-gnome/commit/?id=ac131cab5e5429525aed592b504bae9d6ee92069
|
||||
Patch3: status_fix.patch
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=564820
|
||||
Patch4: %{name}-DSOLink.patch
|
||||
# https://bugzilla.gnome.org/show_bug.cgi?id=608515
|
||||
Patch5: 0001-Added-port-numbers-for-Freenode.patch
|
||||
Patch6: xg-depreciated-macros.patch
|
||||
# https://bugzilla.gnome.org/599781
|
||||
Patch7: 0001-Fix-DCC-transfer-timeouts-when-dcc_auto_send-2.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: openssl-devel
|
||||
Buildrequires: libsexy-devel >= 0.1.11
|
||||
BuildRequires: libgnomeui-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: glib2-devel >= 2.18.0
|
||||
BuildRequires: gtk2-devel >= 2.14.0
|
||||
BuildRequires: libcanberra-devel
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: scrollkeeper
|
||||
BuildRequires: intltool
|
||||
BuildRequires: gettext
|
||||
BuildRequires: perl-devel
|
||||
BuildRequires: perl(XML::Parser)
|
||||
BuildRequires: perl(ExtUtils::Embed)
|
||||
BuildRequires: gnome-doc-utils
|
||||
BuildRequires: GConf2
|
||||
|
||||
Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
|
||||
|
||||
Requires(pre): GConf2
|
||||
Requires(post): GConf2
|
||||
Requires(post): scrollkeeper
|
||||
Requires(preun): GConf2
|
||||
Requires(postun): scrollkeeper
|
||||
|
||||
|
||||
%description
|
||||
xchat-gnome is a new frontend for the popular X-Chat IRC client. GNOME's
|
||||
philosophy in terms of user interfaces has been progressing towards
|
||||
presenting the user with few options, yet sane defaults. While many of the
|
||||
normal X-Chat options will be preserved inside GConf, only the most
|
||||
common settings will be included in the main user interface. .
|
||||
|
||||
|
||||
%prep
|
||||
%setup -q -n %{name}-%{version}
|
||||
%patch0 -p1 -b .config
|
||||
%patch1 -p1 -b .topic
|
||||
%patch2 -p1 -b .crasher
|
||||
%patch3 -p1 -b .status
|
||||
%patch4 -p1 -b .dsolink
|
||||
%patch5 -p1 -b .freenode
|
||||
%patch6 -p1 -b .macros
|
||||
%patch7 -p1 -b .dcc
|
||||
|
||||
|
||||
%build
|
||||
%configure --disable-tcl \
|
||||
--disable-scrollkeeper \
|
||||
--disable-schemas-install \
|
||||
--disable-static
|
||||
make %{?_smp_mflags}
|
||||
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
make install DESTDIR=$RPM_BUILD_ROOT
|
||||
%find_lang %{name}
|
||||
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
|
||||
|
||||
desktop-file-install --vendor fedora --delete-original \
|
||||
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
|
||||
$RPM_BUILD_ROOT%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
|
||||
%pre
|
||||
%gconf_schema_prepare apps_xchat notification urlscraper url_handler
|
||||
|
||||
|
||||
%post
|
||||
%gconf_schema_upgrade apps_xchat notification urlscraper url_handler
|
||||
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
fi
|
||||
|
||||
|
||||
%preun
|
||||
%gconf_schema_remove apps_xchat notification urlscraper url_handler
|
||||
|
||||
|
||||
%postun
|
||||
scrollkeeper-update -q -o %{_datadir}/omf/%{name} || :
|
||||
touch --no-create %{_datadir}/icons/hicolor || :
|
||||
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
|
||||
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
|
||||
fi
|
||||
|
||||
|
||||
%files -f %{name}.lang
|
||||
%defattr(-,root,root,-)
|
||||
%doc COPYING AUTHORS
|
||||
%doc plugins/perl/xchat2-perldocs.html
|
||||
%{_bindir}/%{name}
|
||||
%{_sysconfdir}/gconf/schemas/*.schemas
|
||||
%{_datadir}/%{name}/
|
||||
%{_datadir}/icons/hicolor/128x128/apps/%{name}.png
|
||||
%{_datadir}/icons/hicolor/48x48/apps/%{name}.png
|
||||
%{_datadir}/applications/fedora-%{name}.desktop
|
||||
%{_datadir}/omf/%{name}/
|
||||
%{_datadir}/gnome/help/%{name}/
|
||||
%{_datadir}/dbus-1/services/org.gnome.Xchat.service
|
||||
%{_mandir}/man1/%{name}.1.gz
|
||||
%dir %{_libdir}/%{name}
|
||||
%{_libdir}/%{name}/plugins/
|
||||
|
||||
|
||||
%changelog
|
||||
* Sun Apr 25 2010 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-11
|
||||
- Remove clean section. No longer needed.
|
||||
- Update scriptlets for gconf macros.
|
||||
|
||||
* Sun Mar 28 2010 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-10
|
||||
- Add patch for depreciated gtk macros.
|
||||
- Add patch to fix auto-accept dcc transfers.
|
||||
- Add patch for FreeNode port numbers.
|
||||
|
||||
* Sun Mar 7 2010 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-9
|
||||
- Add patch to fix DSOLinking. (#564820)
|
||||
|
||||
* Mon Jan 18 2010 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-8
|
||||
- Add patch to fix regression with bing unable to set status 'back'.
|
||||
|
||||
* Wed Jan 13 2010 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-7
|
||||
- Add patch to fix crash. (#550662)
|
||||
|
||||
* Mon Dec 7 2009 Stepan Kasal <skasal@redhat.com> - 0.26.1-6
|
||||
- rebuild against perl 5.10.1
|
||||
|
||||
* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 0.26.1-5
|
||||
- rebuilt with new openssl
|
||||
|
||||
* Mon Jul 27 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.26.1-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
|
||||
|
||||
* Fri Jun 19 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-3
|
||||
- Fix topic patch.
|
||||
|
||||
* Sun May 10 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-2
|
||||
- Add patch to fix topic entry bug. (#483839)
|
||||
|
||||
* Sat Apr 18 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.1-1
|
||||
- Update to 0.26.1.
|
||||
|
||||
* Tue Mar 31 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.26.0-1
|
||||
- Update to 0.26.0.
|
||||
|
||||
* Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.24.3.1-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
|
||||
|
||||
* Thu Jan 29 2009 Brian Pepple <bpepple@fedoraproject.org> - 0.24.3.1-1
|
||||
- Update to 0.24.3.1.
|
||||
|
||||
* Sun Jan 18 2009 Tomas Mraz <tmraz@redhat.com> - 0.24.1-3
|
||||
- rebuild with new openssl
|
||||
|
||||
* Sun Nov 30 2008 Ignacio Vazquez-Abrams <ivazqueznet+rpm@gmail.com> - 0.24.1-2
|
||||
- Rebuild for Python 2.6
|
||||
|
||||
* Fri Nov 14 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.24.1-1
|
||||
- Update to 0.24.1.
|
||||
- Update Source URL.
|
||||
|
||||
* Tue Sep 23 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.24.0-1
|
||||
- Update to 0.24.0.
|
||||
- Drop deps patch. Fixed upstream.
|
||||
|
||||
* Tue Sep 9 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.23.92-1
|
||||
- Update to 0.23.92.
|
||||
- Add deps patch to correctly set libnotify & libcanberra options.
|
||||
- Update BR.
|
||||
- Drop reconnect patch. Fixed upstream.
|
||||
- Drop away-command patch. Fixed upstream.
|
||||
- Drop spell-checking patch. Fixed upstream.
|
||||
- Drop it-translation patch. Fixed upstream.
|
||||
|
||||
* Thu Mar 27 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.18-12
|
||||
- Add patch to fix italian translation bug. (#431133)
|
||||
|
||||
* Tue Mar 25 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.18-11
|
||||
- Add patch to fix spell-checking language selection. (#427067)
|
||||
- Add BR on perl-devel & perl(ExtUtils::Embed)to actually build the perl plugin.
|
||||
|
||||
* Thu Mar 06 2008 Tom "spot" Callaway <tcallawa@redhat.com> - 0.18-10
|
||||
- Rebuild for new perl
|
||||
|
||||
* Tue Feb 12 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.18-9
|
||||
- Updated away/back patch. (#430883)
|
||||
|
||||
* Wed Jan 30 2008 Brian Pepple <bpepple@fedoraproject.org> - 0.18-8
|
||||
- Rebuild.
|
||||
|
||||
* Wed Dec 5 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-7
|
||||
- rebuild for new libssl.so.6/libcrypto.so.6
|
||||
|
||||
* Sat Nov 17 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-6
|
||||
- Add patch to fix away/back command.
|
||||
|
||||
* Thu Sep 13 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-5
|
||||
- Add patch to fix reconnect bug. (#225408)
|
||||
|
||||
* Tue Aug 21 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-4
|
||||
- Rebuild.
|
||||
|
||||
* Thu Aug 2 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-3
|
||||
- Update license tag.
|
||||
|
||||
* Mon Jul 9 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-2
|
||||
- Drop requires on python, since dep on python-libs will be pulled in.
|
||||
|
||||
* Mon Jul 9 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.18-1
|
||||
- Update to 0.18.
|
||||
- Drop static patch, fixed upstream.
|
||||
- Drop setup-dialog patch, fixed upstream.
|
||||
- Drop gettext patch.
|
||||
- Update config patch.
|
||||
|
||||
* Sun Jun 10 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-7
|
||||
- Drop requires on yelp.
|
||||
|
||||
* Sat Jun 9 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-6
|
||||
- Add requires on yelp. (#243417)
|
||||
|
||||
* Mon May 28 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-5
|
||||
- Add gettext patch so we don't print translation information when open a query window.
|
||||
|
||||
* Mon Apr 16 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-4
|
||||
- Add patch to fix setup-dialog. (#236636)
|
||||
|
||||
* Tue Apr 3 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-3
|
||||
- Add patch to fix crasher. (#235144).
|
||||
|
||||
* Mon Apr 2 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-2
|
||||
- D'Oh! Forgot to add the new config patch.
|
||||
|
||||
* Mon Apr 2 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.17-1
|
||||
- Update to 0.17 (bugfix release).
|
||||
- Update the config patch.
|
||||
- libsexy-devel to be at least 0.1.11.
|
||||
|
||||
* Tue Jan 16 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.16-2
|
||||
- Drop conditional statement for libnotify.
|
||||
- Remove BR on dbus-devel, since libnotify-devel will pull this in.
|
||||
|
||||
* Wed Jan 10 2007 Brian Pepple <bpepple@fedoraproject.org> - 0.16-1
|
||||
- Update to 0.16.
|
||||
- Move themeable app icon to correct directory.
|
||||
|
||||
* Fri Dec 8 2006 Brian Pepple <bpepple@fedoraproject.org> - 0.15-2
|
||||
- Rebuild for new python.
|
||||
|
||||
* Sun Oct 29 2006 Brian Pepple <bpepple@fedoraproject.org> - 0.15-1
|
||||
- Update to 0.15.
|
||||
- Add new icons.
|
||||
|
||||
* Thu Oct 26 2006 Brian Pepple <bpepple@fedoraproject.org> - 0.14-1
|
||||
- Update to 0.14.
|
||||
- Remove xchat-gnome-remote.
|
||||
- Drop X-Fedora desktop category.
|
||||
- Use disable-schemas-install & disable-static with configure.
|
||||
|
||||
* Thu Aug 31 2006 Brian Pepple <bpepple@fedoraproject.org> - 0.13-4
|
||||
- Add BR for perl(XML::Parser).
|
||||
|
||||
* Thu Aug 31 2006 Brian Pepple <bpepple@fedoraproject.org> - 0.13-3
|
||||
- Update for FC6.
|
||||
|
||||
* Wed Jul 26 2006 Brian Pepple <bpepple@fedoraproject.org> - 0.13-2
|
||||
- Update to 0.13.
|
||||
|
||||
* Tue Jun 20 2006 Brian Pepple <bpepple@fedoraproject.org> - 0.12-2
|
||||
- Update to 0.12.
|
||||
|
||||
* Sat May 20 2006 Brian Pepple <bdpepple@ameritech.net> - 0.11-3
|
||||
- Drop patch for libnotify.
|
||||
|
||||
* Tue Apr 4 2006 Brian Pepple <bdpepple@ameritech.net> - 0.11-2
|
||||
- Update to 0.11
|
||||
- Drop screensaver patch.
|
||||
- Add scriptlet for gtk+ icon cache.
|
||||
|
||||
* Sun Mar 19 2006 Brian Pepple <bdpepple@ameritech.net> - 0.10-5
|
||||
- Rebuild for libsexy-0.1.8.
|
||||
|
||||
* Thu Mar 16 2006 Brian Pepple <bdpepple@ameritech.net> - 0.10-4
|
||||
- Rebuild for new libsexy.
|
||||
|
||||
* Sat Feb 25 2006 Brian Pepple <bdpepple@ameritech.net> - 0.10-3
|
||||
- Add libnotify patch to work with 0.3.0 api.
|
||||
|
||||
* Fri Feb 24 2006 Brian Pepple <bdpepple@ameritech.net> - 0.10-2
|
||||
- Add patch to use correct gnome-screensaver dbus object.
|
||||
- Drop killall gconfd-2 calls in scriptlets.
|
||||
|
||||
* Fri Feb 24 2006 Brian Pepple <bdpepple@ameritech.net> - 0.10-1
|
||||
- Update to 0.10.
|
||||
- Add -disable-scrollkeeprer to config.
|
||||
- Add BR for gnome-doc-utils.
|
||||
- Disable libnotify plugin, until libnotify is updated in Rawhide.
|
||||
|
||||
* Wed Feb 15 2006 Brian Pepple <bdpepple@ameritech.net> - 0.9-6
|
||||
- Drop unnecessary BR (libSM-devel & libglade2-devel).
|
||||
|
||||
* Mon Feb 13 2006 Brian Pepple <bdpepple@ameritech.net> - 0.9-5
|
||||
- rebuilt for new gcc4.1 snapshot and glibc changes
|
||||
|
||||
* Tue Feb 7 2006 Brian Pepple <bdpepple@ameritech.net> - 0.9-4
|
||||
- Rebuild due to new libsexy.
|
||||
|
||||
* Mon Jan 23 2006 Brian Pepple <bdpepple@ameritech.net> - 0.9-3
|
||||
- Bump.
|
||||
|
||||
* Sat Jan 21 2006 Brian Pepple <bdpepple@ameritech.net> - 0.9-2
|
||||
- Add xchat_gnome_url_handler.schemas to scriptlet.
|
||||
|
||||
* Fri Jan 20 2006 Brian Pepple <bdpepple@ameritech.net> - 0.9-1
|
||||
- Update to 0.9.
|
||||
- Add BR for libnotify-devel.
|
||||
- Drop certificates patch.
|
||||
|
||||
* Fri Dec 30 2005 Brian Pepple <bdpepple@ameritech.net> - 0.8-2
|
||||
- add patch for self-signed certificate acceptance. (#174591)
|
||||
|
||||
* Tue Dec 20 2005 Brian Pepple <bdpepple@ameritech.net> - 0.8-1
|
||||
- Udate to 0.8.
|
||||
|
||||
* Sun Dec 18 2005 Brian Pepple <bdpepple@ameritech.net> - 0.8-01.rc2
|
||||
- Update to 0.8rc2.
|
||||
|
||||
* Thu Dec 15 2005 Brian Pepple <bdpepple@ameritech.net> - 0.8-01.rc1
|
||||
- Update to 0.8rc1.
|
||||
- Drop documentation removed from upstream tarball.
|
||||
- Drop depreciated config options.
|
||||
- Enable dbus support.
|
||||
- Drop 323944 patch, since it's been applied upstream.
|
||||
- Drop datadir patch, since it's been applied upstream.
|
||||
|
||||
* Wed Dec 14 2005 Brian Pepple <bdpepple@ameritech.net> - 0.7-4
|
||||
- Add patch to fix #175751.
|
||||
|
||||
* Wed Nov 30 2005 Brian Pepple <bdpepple@ameritech.net> - 0.7-3
|
||||
- Disable dbus support, until FE Bug #174592 is fixed.
|
||||
|
||||
* Mon Nov 21 2005 Brian Pepple <bdpepple@ameritech.net> - 0.7-2
|
||||
- Update to 0.7.
|
||||
- Add BR for libSM-devel.
|
||||
- Disable libnotify support, until it's available in Rawhide.
|
||||
- Add help files & scrollkeeper scriptlets.
|
||||
- Add BR & requires for scrollkeeper.
|
||||
|
||||
* Sat Nov 12 2005 Brian Pepple <bdpepple@ameritech.net> - 0.6-7
|
||||
- Bump
|
||||
|
||||
* Sat Nov 12 2005 Brian Pepple <bdpepple@ameritech.net> - 0.6-6
|
||||
- Bump release for upgrade path from FC-4.
|
||||
|
||||
* Sat Nov 12 2005 Brian Pepple <bdpepple@ameritech.net> - 0.6-5
|
||||
- Add test for release version to determine if dbus is enabled.
|
||||
- Add dist tag.
|
||||
|
||||
* Sat Nov 12 2005 Brian Pepple <bdpepple@ameritech.net> - 0.6-4
|
||||
- Remove obsoletes xchat.
|
||||
- Add patch to change datadir location.
|
||||
- Add patch to change config dir.
|
||||
|
||||
* Thu Nov 10 2005 Brian Pepple <bdpepple@ameritech.net> - 0.6-3
|
||||
- Add xchat-remote to files, and re-add dbus config flag.
|
||||
|
||||
* Thu Nov 10 2005 Brian Pepple <bdpepple@ameritech.net> - 0.6-2
|
||||
- Merge some items from Bastien Nocera's spec file (#172873).
|
||||
- Add configure option to enable ipv6 & shm tinting support.
|
||||
- Simplify schemas installation.
|
||||
|
||||
* Tue Oct 25 2005 Brian Pepple <bdpepple@ameritech.net> - 0.6-1
|
||||
- Initial Fedora Extras spec file.
|
||||
|
||||
20
xchat-topic-update.patch
Normal file
20
xchat-topic-update.patch
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
From 6d1a939a14de918de4a79c010d82796f8035bcfa Mon Sep 17 00:00:00 2001
|
||||
From: Josselin Mouette <^Css@malsain.org>
|
||||
Date: Thu, 18 Jun 2009 09:41:33 +0000
|
||||
Subject: Bug 536916 – Pressing "Enter" in the middle of editing channel topic truncates it.
|
||||
|
||||
---
|
||||
diff --git a/src/fe-gnome/topic-label.c b/src/fe-gnome/topic-label.c
|
||||
index a7d1883..977d29c 100644
|
||||
--- a/src/fe-gnome/topic-label.c
|
||||
+++ b/src/fe-gnome/topic-label.c
|
||||
@@ -315,6 +315,7 @@ static void
|
||||
topic_entry_activate (GtkTextBuffer *textbuffer, GtkTextIter *arg1, gchar *text, gint len, GtkDialog *dialog)
|
||||
{
|
||||
if (strncmp (text, "\n", len) == 0) {
|
||||
+ g_signal_stop_emission_by_name (G_OBJECT (textbuffer), "insert-text");
|
||||
gtk_dialog_response (dialog, GTK_RESPONSE_OK);
|
||||
}
|
||||
}
|
||||
--
|
||||
cgit v0.8.2
|
||||
137
xg-depreciated-macros.patch
Normal file
137
xg-depreciated-macros.patch
Normal file
|
|
@ -0,0 +1,137 @@
|
|||
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c
|
||||
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/fe-gnome.c 2008-09-07 09:18:45.000000000 -0400
|
||||
+++ xchat-gnome-0.26.1/src/fe-gnome/fe-gnome.c 2010-03-28 16:16:52.181405173 -0400
|
||||
@@ -753,7 +753,7 @@ fe_gui_info (session * sess, int info_ty
|
||||
{
|
||||
switch (info_type) {
|
||||
case 0:
|
||||
- if (!GTK_WIDGET_VISIBLE (GTK_WINDOW (gui.main_window))) {
|
||||
+ if (!gtk_widget_get_visible (GTK_WIDGET (gui.main_window))) {
|
||||
return 2;
|
||||
}
|
||||
if (gtk_window_is_active (GTK_WINDOW (gui.main_window))) {
|
||||
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c xchat-gnome-0.26.1/src/fe-gnome/find-bar.c
|
||||
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/find-bar.c 2007-03-09 10:42:57.000000000 -0500
|
||||
+++ xchat-gnome-0.26.1/src/fe-gnome/find-bar.c 2010-03-28 16:26:24.300405158 -0400
|
||||
@@ -247,7 +247,7 @@ find_bar_close (FindBar *bar)
|
||||
{
|
||||
gint position;
|
||||
|
||||
- if (!GTK_WIDGET_VISIBLE (bar)) {
|
||||
+ if (!gtk_widget_get_visible (GTK_WIDGET (bar))) {
|
||||
return;
|
||||
}
|
||||
|
||||
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c xchat-gnome-0.26.1/src/fe-gnome/text-entry.c
|
||||
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/text-entry.c 2008-09-07 10:02:45.000000000 -0400
|
||||
+++ xchat-gnome-0.26.1/src/fe-gnome/text-entry.c 2010-03-28 16:39:48.755153605 -0400
|
||||
@@ -667,7 +667,7 @@ text_entry_set_current (TextEntry *entry
|
||||
char *selection = NULL, *text = NULL;
|
||||
int start, end;
|
||||
|
||||
- g_return_if_fail (GTK_WIDGET_REALIZED (widget));
|
||||
+ g_return_if_fail (gtk_widget_get_realized (GTK_WIDGET (widget)));
|
||||
|
||||
if (sess == priv->current) {
|
||||
return;
|
||||
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c
|
||||
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/userlist-gui.c 2008-10-13 17:02:16.000000000 -0400
|
||||
+++ xchat-gnome-0.26.1/src/fe-gnome/userlist-gui.c 2010-03-28 16:47:55.703154452 -0400
|
||||
@@ -261,12 +261,12 @@ userlist_gui_show (void)
|
||||
|
||||
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (gui.userlist_toggle), TRUE);
|
||||
|
||||
- if (!GTK_WIDGET_REALIZED (gui.userlist_window)) {
|
||||
+ if (!gtk_widget_get_realized (GTK_WIDGET (gui.userlist_window))) {
|
||||
gtk_widget_realize (gui.userlist_window);
|
||||
}
|
||||
gtk_widget_size_request (gui.userlist, &request);
|
||||
|
||||
- if (GTK_WIDGET_REALIZED (gui.userlist_toggle))
|
||||
+ if (gtk_widget_get_realized (GTK_WIDGET (gui.userlist_toggle)))
|
||||
anchor_widget = gui.userlist_toggle;
|
||||
else
|
||||
anchor_widget = gui.main_window;
|
||||
diff -urp xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c xchat-gnome-0.26.1/src/fe-gnome/xtext.c
|
||||
--- xchat-gnome-0.26.1.OLD/src/fe-gnome/xtext.c 2009-01-16 08:17:31.000000000 -0500
|
||||
+++ xchat-gnome-0.26.1/src/fe-gnome/xtext.c 2010-03-28 16:57:17.441402617 -0400
|
||||
@@ -1086,7 +1086,7 @@ gtk_xtext_size_allocate (GtkWidget * wid
|
||||
xtext->avoid_trans = FALSE;
|
||||
|
||||
widget->allocation = *allocation;
|
||||
- if (GTK_WIDGET_REALIZED (widget))
|
||||
+ if (gtk_widget_get_realized (GTK_WIDGET (widget)))
|
||||
{
|
||||
xtext->buffer->window_width = allocation->width;
|
||||
xtext->buffer->window_height = allocation->height;
|
||||
@@ -4113,7 +4113,7 @@ gtk_xtext_set_palette (GtkXText * xtext,
|
||||
xtext->palette[i] = palette[i].pixel;
|
||||
}
|
||||
|
||||
- if (GTK_WIDGET_REALIZED (xtext))
|
||||
+ if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
{
|
||||
xtext_set_fg (xtext, xtext->fgc, XTEXT_FG);
|
||||
xtext_set_bg (xtext, xtext->fgc, XTEXT_BG);
|
||||
@@ -4211,7 +4211,7 @@ gtk_xtext_set_font (GtkXText *xtext, cha
|
||||
|
||||
gtk_xtext_fix_indent (xtext->buffer);
|
||||
|
||||
- if (GTK_WIDGET_REALIZED (xtext))
|
||||
+ if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
gtk_xtext_recalc_widths (xtext->buffer, TRUE);
|
||||
|
||||
return TRUE;
|
||||
@@ -4248,7 +4248,7 @@ gtk_xtext_set_background (GtkXText * xte
|
||||
if (trans)
|
||||
{
|
||||
xtext->shaded = shaded;
|
||||
- if (GTK_WIDGET_REALIZED (xtext))
|
||||
+ if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
gtk_xtext_load_trans (xtext);
|
||||
return;
|
||||
}
|
||||
@@ -4260,14 +4260,14 @@ gtk_xtext_set_background (GtkXText * xte
|
||||
if (pixmap != 0)
|
||||
{
|
||||
g_object_ref (pixmap);
|
||||
- if (GTK_WIDGET_REALIZED (xtext))
|
||||
+ if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
{
|
||||
gdk_gc_set_tile (xtext->bgc, pixmap);
|
||||
gdk_gc_set_ts_origin (xtext->bgc, 0, 0);
|
||||
xtext->ts_x = xtext->ts_y = 0;
|
||||
gdk_gc_set_fill (xtext->bgc, GDK_TILED);
|
||||
}
|
||||
- } else if (GTK_WIDGET_REALIZED (xtext))
|
||||
+ } else if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
{
|
||||
g_object_unref (xtext->bgc);
|
||||
val.subwindow_mode = GDK_INCLUDE_INFERIORS;
|
||||
@@ -4516,7 +4516,7 @@ gtk_xtext_render_page (GtkXText * xtext)
|
||||
int subline;
|
||||
int startline = xtext->adj->value;
|
||||
|
||||
- if(!GTK_WIDGET_REALIZED(xtext))
|
||||
+ if(!gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
return;
|
||||
|
||||
if (xtext->buffer->indent < MARGIN)
|
||||
@@ -4636,7 +4636,7 @@ gtk_xtext_render_page (GtkXText * xtext)
|
||||
void
|
||||
gtk_xtext_refresh (GtkXText * xtext, int do_trans)
|
||||
{
|
||||
- if (GTK_WIDGET_REALIZED (GTK_WIDGET (xtext)))
|
||||
+ if (gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
{
|
||||
#if defined(USE_XLIB) || defined(WIN32)
|
||||
if (xtext->transparent && do_trans)
|
||||
@@ -5204,7 +5204,7 @@ gtk_xtext_buffer_show (GtkXText *xtext,
|
||||
xtext->io_tag = 0;
|
||||
}
|
||||
|
||||
- if (!GTK_WIDGET_REALIZED (GTK_WIDGET (xtext)))
|
||||
+ if (!gtk_widget_get_realized (GTK_WIDGET (xtext)))
|
||||
gtk_widget_realize (GTK_WIDGET (xtext));
|
||||
|
||||
gdk_drawable_get_size (GTK_WIDGET (xtext)->window, &w, &h);
|
||||
Loading…
Add table
Add a link
Reference in a new issue