evolution r34952 - in trunk: plugins/attachment-reminder widgets widgets/text
- From: mbarnes svn gnome org
- To: svn-commits-list gnome org
- Subject: evolution r34952 - in trunk: plugins/attachment-reminder widgets widgets/text
- Date: Sun, 3 Feb 2008 05:52:36 +0000 (GMT)
Author: mbarnes
Date: Sun Feb 3 05:52:36 2008
New Revision: 34952
URL: http://svn.gnome.org/viewvc/evolution?rev=34952&view=rev
Log:
2008-02-03 Matthew Barnes <mbarnes redhat com>
* pluginsattachment-reminder.c
(org_gnome_evolution_attachment_reminder):
Fix a compiler warning.
* widgets/text/e-text.c (update_im_cursor_position):
* widgets/text/e-text.c (e_text_get_cursor_locations):
Remove these unused functions to silence compiler warnings.
Modified:
trunk/plugins/attachment-reminder/ChangeLog
trunk/plugins/attachment-reminder/attachment-reminder.c
trunk/widgets/ChangeLog
trunk/widgets/text/e-text.c
Modified: trunk/plugins/attachment-reminder/attachment-reminder.c
==============================================================================
--- trunk/plugins/attachment-reminder/attachment-reminder.c (original)
+++ trunk/plugins/attachment-reminder/attachment-reminder.c Sun Feb 3 05:52:36 2008
@@ -112,7 +112,7 @@
raw_msg_barray = g_byte_array_append (raw_msg_barray, (const guint8 *)"", 1);
- filtered_str = strip_text_msg (raw_msg_barray->data);
+ filtered_str = strip_text_msg ((gchar *) raw_msg_barray->data);
g_byte_array_free (raw_msg_barray, TRUE);
/* Set presend_check_status for the composer*/
Modified: trunk/widgets/text/e-text.c
==============================================================================
--- trunk/widgets/text/e-text.c (original)
+++ trunk/widgets/text/e-text.c Sun Feb 3 05:52:36 2008
@@ -132,7 +132,6 @@
static void reset_layout_attrs (EText *text);
-static void update_im_cursor_position (EText *text);
#if 0
/* GtkEditable Methods */
static void e_text_editable_do_insert_text (GtkEditable *editable,
@@ -3902,57 +3901,6 @@
}
}
-/*
- * Fetch cursor location into Strong or Weak positions so as to
- * display the preedit candidate selection window in the right place
- */
-static void
-e_text_get_cursor_locations (EText *text,
- GdkRectangle *strong_pos,
- GdkRectangle *weak_pos)
-{
- double x1, y1;
- PangoRectangle pango_strong_pos;
- PangoRectangle pango_weak_pos;
- int cx, cy;
- gint index;
-
- gnome_canvas_item_get_bounds (GNOME_CANVAS_ITEM (text), &x1, &y1, NULL, NULL);
-
- gnome_canvas_get_scroll_offsets (GNOME_CANVAS (GNOME_CANVAS_ITEM (text)->canvas), &cx, &cy);
-
- index = g_utf8_offset_to_pointer (text->text, text->selection_start) - text->text;
-
- pango_layout_get_cursor_pos (text->layout, index + text->preedit_pos,
- strong_pos ? &pango_strong_pos : NULL,
- weak_pos ? &pango_weak_pos : NULL);
-
- if (strong_pos) {
- strong_pos->x = x1 - cx - text->xofs_edit + pango_strong_pos.x / PANGO_SCALE;
- strong_pos->y = y1 - cy - text->yofs_edit + pango_strong_pos.y / PANGO_SCALE;
- strong_pos->width = 0;
- strong_pos->height = pango_strong_pos.height / PANGO_SCALE;
- }
-
- if (weak_pos) {
- weak_pos->x = x1 - cx - text->xofs_edit + pango_weak_pos.x / PANGO_SCALE;
- weak_pos->y = y1 - cy - text->yofs_edit + pango_weak_pos.y / PANGO_SCALE;
- weak_pos->width = 0;
- weak_pos->height = pango_weak_pos.height / PANGO_SCALE;
- }
-}
-
-/* Update IM's cursor position to display candidate selection window */
-static void
-update_im_cursor_position (EText *text)
-{
- GdkRectangle area;
-
- e_text_get_cursor_locations (text, &area, NULL);
-
- gtk_im_context_set_cursor_location (text->im_context, &area);
-}
-
static void
e_text_preedit_changed_cb (GtkIMContext *context,
EText *etext)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]