← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/irssi/oneiric

« back to all changes in this revision

Viewing changes to debian/patches/01glib-errors.dpatch

  • Committer: Bazaar Package Importer
  • Author(s): Emilio Pozuelo Monfort
  • Date: 2007-11-02 18:13:28 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20071102181328-vg4v2tuqeviu16g9
Tags: 0.8.12-2ubuntu1
https://launchpad.net/bugs/67698
* Merge with Debian, remaining Ubuntu changes:
  - Added debian/patches/90irc-ubuntu-com.dpatch (Launchpad #52690).
  - Modify Maintainer value to match the DebianMaintainerField spec.
  - debian/irssi.prerm: Do not alternative. LP: #67698.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/01glib-errors.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 01glib-errors.dpatch by David Pashley <david@davidpashley.com>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad --exclude=CVS --exclude=.svn ./src/fe-common/core/fe-common-core.c /tmp/dpep-work.Z3VDTJ/irssi-0.8.10~rc5/src/fe-common/core/fe-common-core.c
9
 
--- ./src/fe-common/core/fe-common-core.c       2004-08-20 03:02:29.000000000 +0300
10
 
+++ /tmp/dpep-work.Z3VDTJ/irssi-0.8.10~rc5/src/fe-common/core/fe-common-core.c  2005-07-15 21:57:54.000000000 +0300
11
 
@@ -430,6 +430,10 @@
12
 
                          (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL |
13
 
                                            G_LOG_LEVEL_WARNING),
14
 
                          (GLogFunc) glog_func, NULL);
15
 
+       g_log_set_handler("GLib",
16
 
+                         (GLogLevelFlags) (G_LOG_LEVEL_CRITICAL |
17
 
+                                           G_LOG_LEVEL_WARNING),
18
 
+                         (GLogFunc) glog_func, NULL); /* send glib errors to the same place */
19
 
 
20
 
        if (setup_changed)
21
 
                 signal_emit("setup changed", 0);