← Back to branch summary

~ubuntu-branches/ubuntu/precise/uim/precise

« back to all changes in this revision

Viewing changes to debian/patches/08_fix_segv_on_iceweasel_and_flashplugin.dpatch

  • Committer: Package Import Robot
  • Author(s): Ilya Barygin
  • Date: 2011-12-18 16:35:38 UTC
  • mfrom: (1.1.13) (15.1.7 sid)
  • Revision ID: package-import@ubuntu.com-20111218163538-8ktir39z2mjpii8z
Tags: 1:1.7.1-3ubuntu1
https://launchpad.net/bugs/818199
* Merge from Debian testing (LP: #818199).
* Remaining changes:
  - debian/uim-qt.install: Fix plugin path for multiarch location.
* Dropped changes:
  - uim-applet-gnome removal (GNOME 3 applet is available)
  - 19_as-needed_compile_fix.dpatch (accepted into Debian package)
* translations.patch: add several files to POTFILE.in to prevent
  intltool-update failure.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/08_fix_segv_on_iceweasel_and_flashplugin.dpatch
1
 
#! /bin/sh /usr/share/dpatch/dpatch-run
2
 
## 08_fix_segv_on_iceweasel_and_flashplugin.dpatch by  <kiwamu@debian.or.jp>
3
 
##
4
 
## All lines beginning with `## DP:' are a description of the patch.
5
 
## DP: No description.
6
 
 
7
 
@DPATCH@
8
 
diff -urNad uim-1.5.6~/gtk/gtk-im-uim.c uim-1.5.6/gtk/gtk-im-uim.c
9
 
--- uim-1.5.6~/gtk/gtk-im-uim.c 2009-01-21 11:16:35.000000000 +0900
10
 
+++ uim-1.5.6/gtk/gtk-im-uim.c  2009-11-19 20:25:43.000000000 +0900
11
 
@@ -329,6 +329,12 @@
12
 
 }
13
 
 
14
 
 static void
15
 
+cur_toplevel_deleted(GtkWidget *widget, gpointer data)
16
 
+{
17
 
+  cur_toplevel = NULL;
18
 
+}
19
 
+
20
 
+static void
21
 
 update_cur_toplevel(IMUIMContext *uic)
22
 
 {
23
 
   /* Don't set our candwin's text widget as cur_toplevel */
24
 
@@ -358,6 +364,9 @@
25
 
        cur_key_release_handler_id = g_signal_connect(cur_toplevel,
26
 
                        "key-release-event",
27
 
                        G_CALLBACK(handle_key_on_toplevel), uic);
28
 
+       g_signal_connect(cur_toplevel,
29
 
+                       "delete_event",
30
 
+                       G_CALLBACK(cur_toplevel_deleted), NULL);
31
 
       }
32
 
     } else
33
 
       remove_cur_toplevel();