← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nip2/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/ubuntu_fix-ftbfs-gtk-2.21.patch

  • Committer: Bazaar Package Importer
  • Author(s): Fabrice Coutadeur
  • Date: 2010-07-21 21:45:25 UTC
  • mfrom: (1.3.1 upstream) (23.1.2 maverick)
  • Revision ID: james.westby@ubuntu.com-20100721214525-molddiwk7fvrhu7g
Tags: 7.20.7-2ubuntu2
No changes upload for libmagick2 -> libmagick3 transition

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/ubuntu_fix-ftbfs-gtk-2.21.patch
 
1
--- nip2-7.20.7.orig/src/gtkitementry.c
 
2
+++ nip2-7.20.7/src/gtkitementry.c
 
3
@@ -143,7 +143,6 @@ static void         gtk_entry_draw_curso
 
4
 static PangoLayout *gtk_entry_ensure_layout            (GtkEntry       *entry,
 
5
                                                         gboolean        include_preedit);
 
6
 static void         gtk_entry_queue_draw               (GtkEntry       *entry);
 
7
-static void         gtk_entry_reset_im_context         (GtkEntry       *entry);
 
8
 static void         gtk_entry_recompute                (GtkEntry       *entry);
 
9
 static void         gtk_entry_get_cursor_locations     (GtkEntry       *entry,
 
10
                                                        CursorType      type,
 
11
@@ -1615,16 +1614,6 @@ gtk_entry_queue_draw (GtkEntry *entry)
 
12
 }
 
13
 
 
14
 static void
 
15
-gtk_entry_reset_im_context (GtkEntry *entry)
 
16
-{
 
17
-  if (entry->need_im_reset)
 
18
-    {
 
19
-      entry->need_im_reset = 0;
 
20
-      gtk_im_context_reset (entry->im_context);
 
21
-    }
 
22
-}
 
23
-
 
24
-static void
 
25
 gtk_entry_get_cursor_locations (GtkEntry   *entry,
 
26
                                CursorType  type,
 
27
                                gint       *strong_x,