* [gentoo-commits] gentoo-x86 commit in sci-electronics/geda/files: geda-gattrib-1.4.0-gtkentry.patch
@ 2010-06-22 18:43 Thomas Beierlein (tomjbe)
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Beierlein (tomjbe) @ 2010-06-22 18:43 UTC (permalink / raw
To: gentoo-commits
tomjbe 10/06/22 18:43:03
Added: geda-gattrib-1.4.0-gtkentry.patch
Log:
fix for renamed members of GTKEntry from gtk+-2.17 on (see bug 323127)
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Revision Changes Path
1.1 sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sci-electronics/geda/files/geda-gattrib-1.4.0-gtkentry.patch?rev=1.1&content-type=text/plain
Index: geda-gattrib-1.4.0-gtkentry.patch
===================================================================
diff -ur -u geda-gattrib-1.4.3.orig/src/gtkitementry_2_2.c geda-gattrib-1.4.3/src/gtkitementry_2_2.c
--- geda-gattrib-1.4.3.orig/src/gtkitementry_2_2.c 2010-06-08 16:53:06.000000000 +0000
+++ geda-gattrib-1.4.3/src/gtkitementry_2_2.c 2010-06-08 16:56:16.000000000 +0000
@@ -811,23 +811,23 @@
new_text_length = g_utf8_offset_to_pointer (new_text, n_chars) - new_text;
}
- if (new_text_length + entry->n_bytes + 1 > entry->text_size)
+ if (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
{
- while (new_text_length + entry->n_bytes + 1 > entry->text_size)
+ while (new_text_length + entry->x_n_bytes + 1 > entry->x_text_size)
{
- if (entry->text_size == 0)
- entry->text_size = MIN_SIZE;
+ if (entry->x_text_size == 0)
+ entry->x_text_size = MIN_SIZE;
else
{
- if (2 * (guint)entry->text_size < MAX_SIZE &&
- 2 * (guint)entry->text_size > entry->text_size)
- entry->text_size *= 2;
+ if (2 * (guint)entry->x_text_size < MAX_SIZE &&
+ 2 * (guint)entry->x_text_size > entry->x_text_size)
+ entry->x_text_size *= 2;
else
{
- entry->text_size = MAX_SIZE;
- if (new_text_length > (gint)entry->text_size - (gint)entry->n_bytes - 1)
+ entry->x_text_size = MAX_SIZE;
+ if (new_text_length > (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1)
{
- new_text_length = (gint)entry->text_size - (gint)entry->n_bytes - 1;
+ new_text_length = (gint)entry->x_text_size - (gint)entry->x_n_bytes - 1;
new_text_length = g_utf8_find_prev_char (new_text, new_text + new_text_length + 1) - new_text;
n_chars = g_utf8_strlen (new_text, new_text_length);
}
@@ -836,19 +836,19 @@
}
}
- entry->text = g_realloc (entry->text, entry->text_size);
+ entry->text = g_realloc (entry->text, entry->x_text_size);
}
index = g_utf8_offset_to_pointer (entry->text, *position) - entry->text;
- g_memmove (entry->text + index + new_text_length, entry->text + index, entry->n_bytes - index);
+ g_memmove (entry->text + index + new_text_length, entry->text + index, entry->x_n_bytes - index);
memcpy (entry->text + index, new_text, new_text_length);
- entry->n_bytes += new_text_length;
+ entry->x_n_bytes += new_text_length;
entry->text_length += n_chars;
/* NUL terminate for safety and convenience */
- entry->text[entry->n_bytes] = '\0';
+ entry->text[entry->x_n_bytes] = '\0';
if (entry->current_pos > *position)
entry->current_pos += n_chars;
@@ -881,9 +881,9 @@
gint start_index = g_utf8_offset_to_pointer (entry->text, start_pos) - entry->text;
gint end_index = g_utf8_offset_to_pointer (entry->text, end_pos) - entry->text;
- g_memmove (entry->text + start_index, entry->text + end_index, entry->n_bytes + 1 - end_index);
+ g_memmove (entry->text + start_index, entry->text + end_index, entry->x_n_bytes + 1 - end_index);
entry->text_length -= (end_pos - start_pos);
- entry->n_bytes -= (end_index - start_index);
+ entry->x_n_bytes -= (end_index - start_index);
if (entry->current_pos > start_pos)
entry->current_pos -= MIN (entry->current_pos, end_pos) - start_pos;
@@ -1157,7 +1157,7 @@
{
gtk_im_context_set_surrounding (context,
entry->text,
- entry->n_bytes,
+ entry->x_n_bytes,
g_utf8_offset_to_pointer (entry->text, entry->current_pos) - entry->text);
return TRUE;
@@ -1364,7 +1364,7 @@
if (entry->visible)
{
- g_string_prepend_len (tmp_string, entry->text, entry->n_bytes);
+ g_string_prepend_len (tmp_string, entry->text, entry->x_n_bytes);
g_string_insert (tmp_string, cursor_index, preedit_string);
}
else
@@ -1373,7 +1373,7 @@
gint preedit_len_chars;
gunichar invisible_char;
- ch_len = g_utf8_strlen (entry->text, entry->n_bytes);
+ ch_len = g_utf8_strlen (entry->text, entry->x_n_bytes);
preedit_len_chars = g_utf8_strlen (preedit_string, -1);
ch_len += preedit_len_chars;
@@ -1407,7 +1407,7 @@
{
if (entry->visible)
{
- pango_layout_set_text (layout, entry->text, entry->n_bytes);
+ pango_layout_set_text (layout, entry->text, entry->x_n_bytes);
}
else
{
^ permalink raw reply [flat|nested] 2+ messages in thread
* [gentoo-commits] gentoo-x86 commit in sci-electronics/geda/files: geda-gattrib-1.4.0-gtkentry.patch
@ 2011-03-25 19:58 Thomas Beierlein (tomjbe)
0 siblings, 0 replies; 2+ messages in thread
From: Thomas Beierlein (tomjbe) @ 2011-03-25 19:58 UTC (permalink / raw
To: gentoo-commits
tomjbe 11/03/25 19:58:15
Removed: geda-gattrib-1.4.0-gtkentry.patch
Log:
Drop old version.
(Portage version: 2.1.9.44/cvs/Linux x86_64)
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-25 19:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-06-22 18:43 [gentoo-commits] gentoo-x86 commit in sci-electronics/geda/files: geda-gattrib-1.4.0-gtkentry.patch Thomas Beierlein (tomjbe)
-- strict thread matches above, loose matches on Subject: below --
2011-03-25 19:58 Thomas Beierlein (tomjbe)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox