/[pkgs]/devel/GtkAda/GtkAda-gtk217.patch
ViewVC logotype

Contents of /devel/GtkAda/GtkAda-gtk217.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Sun Aug 9 14:54:31 2009 UTC (3 months, 2 weeks ago) by gemi
Branch: MAIN
CVS Tags: F-12-split, GtkAda-2_14_0-1_fc12, HEAD
File MIME type: text/x-patch 
update to 2.14.0
1 diff -up GtkAda-2.14.0/src/gtkextra/gtkitementry.c.gtk217 GtkAda-2.14.0/src/gtkextra/gtkitementry.c
2 --- GtkAda-2.14.0/src/gtkextra/gtkitementry.c.gtk217 2009-08-09 07:19:21.000000000 -0600
3 +++ GtkAda-2.14.0/src/gtkextra/gtkitementry.c 2009-08-09 07:22:10.000000000 -0600
4 @@ -693,23 +693,23 @@ gtk_entry_real_insert_text (GtkEditable
5 new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
6 }
7
8 - if (new_text_length + entry->n_bytes + 1 > entry->text_size)
9 + if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
10 {
11 - while (new_text_length + entry->n_bytes + 1 > entry->text_size)
12 + while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
13 {
14 - if (entry->text_size == 0)
15 - entry->text_size = MIN_SIZE;
16 + if (entry->x_text_size == 0)
17 + entry->x_text_size = MIN_SIZE;
18 else
19 {
20 - if (2 * (guint)entry->text_size < MAX_SIZE &&
21 - 2 * (guint)entry->text_size > entry->text_size)
22 - entry->text_size *= 2;
23 + if (2 * (guint)entry->x_text_size < MAX_SIZE &&
24 + 2 * (guint)entry->x_text_size > entry->x_text_size)
25 + entry->x_text_size *= 2;
26 else
27 {
28 - entry->text_size = MAX_SIZE;
29 - if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
30 + entry->x_text_size = MAX_SIZE;
31 + if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
32 {
33 - new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
34 + new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
35 new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
36 n_chars = g_utf8_strlen (new_text, new_text_length);
37 }
38 @@ -718,19 +718,19 @@ gtk_entry_real_insert_text (GtkEditable
39 }
40 }
41
42 - entry->text = g_realloc (entry->text, entry->text_size);
43 + entry->text = g_realloc (entry->text, entry->x_text_size);
44 }
45
46 index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
47
48 - g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
49 + g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
50 memcpy (entry->text + index, new_text, new_text_length);
51
52 - entry->n_bytes += new_text_length;
53 + entry->x_n_bytes += new_text_length;
54 entry->text_length += n_chars;
55
56 /* NUL terminate for safety and convenience */
57 - entry->text[entry->n_bytes] = '\0';
58 + entry->text[entry->x_n_bytes] = '\0';
59
60 if (entry->current_pos > *position)
61 entry->current_pos += n_chars;
62 @@ -763,9 +763,9 @@ gtk_entry_real_delete_text (GtkEditable
63 gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
64 gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
65
66 - g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
67 + g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
68 entry->text_length -= (end_pos - start_pos);
69 - entry->n_bytes -= (end_index - start_index);
70 + entry->x_n_bytes -= (end_index - start_index);
71
72 if (entry->current_pos > start_pos)
73 entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
74 @@ -1028,7 +1028,7 @@ gtk_entry_retrieve_surrounding_cb (GtkIM
75 {
76 gtk_im_context_set_surrounding (context,
77 entry->text,
78 - entry->n_bytes,
79 + entry->x_n_bytes,
80 g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
81
82 return TRUE;
83 @@ -1229,7 +1229,7 @@ gtk_entry_create_layout (GtkEntry *entry
84
85 if (entry->visible)
86 {
87 - g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
88 + g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
89 g_string_insert (tmp_string, cursor_index, preedit_string);
90 }
91 else
92 @@ -1238,7 +1238,7 @@ gtk_entry_create_layout (GtkEntry *entry
93 gint preedit_len_chars;
94 gunichar invisible_char;
95
96 - ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
97 + ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
98 preedit_len_chars = g_utf8_strlen (preedit_string, -1);
99 ch_len += preedit_len_chars;
100
101 @@ -1272,7 +1272,7 @@ gtk_entry_create_layout (GtkEntry *entry
102 {
103 if (entry->visible)
104 {
105 - pango_layout_set_text (layout, entry->text, entry->n_bytes);
106 + pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
107 }
108 else
109 {
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2