Blame xchat-2.8.8-glib.patch
|
 |
217a377 |
--- src/common/text.c.orig 2012-02-25 11:05:23.890274334 -0600
|
|
|
217a377 |
+++ src/common/text.c 2012-02-25 11:05:39.006195489 -0600
|
|
|
217a377 |
@@ -28,7 +28,7 @@
|
|
|
217a377 |
#include <sys/mman.h>
|
|
|
217a377 |
|
|
|
217a377 |
#include "xchat.h"
|
|
|
217a377 |
-#include <glib/ghash.h>
|
|
|
217a377 |
+#include <glib.h>
|
|
|
217a377 |
#include "cfgfiles.h"
|
|
|
217a377 |
#include "chanopt.h"
|
|
|
217a377 |
#include "plugin.h"
|
|
|
217a377 |
--- src/common/servlist.c.orig 2012-02-25 11:04:30.601501605 -0600
|
|
|
217a377 |
+++ src/common/servlist.c 2012-02-25 11:04:42.964072823 -0600
|
|
|
217a377 |
@@ -24,7 +24,7 @@
|
|
|
217a377 |
#include <unistd.h>
|
|
|
217a377 |
|
|
|
217a377 |
#include "xchat.h"
|
|
|
217a377 |
-#include <glib/ghash.h>
|
|
|
217a377 |
+#include <glib.h>
|
|
|
217a377 |
|
|
|
217a377 |
#include "cfgfiles.h"
|
|
|
217a377 |
#include "fe.h"
|
|
|
217a377 |
--- src/common/dbus/dbus-client.c.orig 2012-02-25 10:59:23.948527589 -0600
|
|
|
217a377 |
+++ src/common/dbus/dbus-client.c 2012-02-25 11:00:40.082203787 -0600
|
|
|
217a377 |
@@ -53,11 +53,6 @@
|
|
|
217a377 |
GError *error = NULL;
|
|
|
217a377 |
char *command = NULL;
|
|
|
217a377 |
|
|
|
217a377 |
- /* GnomeVFS >=2.15 uses D-Bus and threads, so threads should be
|
|
|
217a377 |
- * initialised before opening for the first time a D-Bus connection */
|
|
|
217a377 |
- if (!g_thread_supported ()) {
|
|
|
217a377 |
- g_thread_init (NULL);
|
|
|
217a377 |
- }
|
|
|
217a377 |
dbus_g_thread_init ();
|
|
|
217a377 |
|
|
|
217a377 |
/* if there is nothing to do, return now. */
|
|
|
217a377 |
--- src/common/xchat.h.orig 2012-02-25 11:29:33.400499630 -0600
|
|
|
217a377 |
+++ src/common/xchat.h 2012-02-25 11:29:51.774834912 -0600
|
|
|
217a377 |
@@ -1,10 +1,6 @@
|
|
|
217a377 |
#include "../../config.h"
|
|
|
217a377 |
|
|
|
217a377 |
-#include <glib/gslist.h>
|
|
|
217a377 |
-#include <glib/glist.h>
|
|
|
217a377 |
-#include <glib/gutils.h>
|
|
|
217a377 |
-#include <glib/giochannel.h>
|
|
|
217a377 |
-#include <glib/gstrfuncs.h>
|
|
|
217a377 |
+#include <glib.h>
|
|
|
217a377 |
#include <time.h> /* need time_t */
|
|
|
217a377 |
|
|
|
217a377 |
#ifndef XCHAT_H
|
|
|
217a377 |
--- src/common/util.c.orig 2012-02-25 11:38:29.404622998 -0600
|
|
|
217a377 |
+++ src/common/util.c 2012-02-25 11:38:51.904482615 -0600
|
|
|
217a377 |
@@ -39,7 +39,7 @@
|
|
|
217a377 |
#include <errno.h>
|
|
|
217a377 |
#include "xchat.h"
|
|
|
217a377 |
#include "xchatc.h"
|
|
|
217a377 |
-#include <glib/gmarkup.h>
|
|
|
217a377 |
+#include <glib.h>
|
|
|
217a377 |
#include <ctype.h>
|
|
|
217a377 |
#include "util.h"
|
|
|
217a377 |
#include "../../config.h"
|