aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2008-02-03 13:52:36 +0800
committerMatthew Barnes <mbarnes@src.gnome.org>2008-02-03 13:52:36 +0800
commitfd28f516c5e1c4f9954ba1e0bf238e7c58271686 (patch)
tree6d3c38251668cf982873585c963f8fc3a769440b
parentc85149ef7eddf2418b434892a95ab743ed0b749c (diff)
downloadgsoc2013-evolution-fd28f516c5e1c4f9954ba1e0bf238e7c58271686.tar
gsoc2013-evolution-fd28f516c5e1c4f9954ba1e0bf238e7c58271686.tar.gz
gsoc2013-evolution-fd28f516c5e1c4f9954ba1e0bf238e7c58271686.tar.bz2
gsoc2013-evolution-fd28f516c5e1c4f9954ba1e0bf238e7c58271686.tar.lz
gsoc2013-evolution-fd28f516c5e1c4f9954ba1e0bf238e7c58271686.tar.xz
gsoc2013-evolution-fd28f516c5e1c4f9954ba1e0bf238e7c58271686.tar.zst
gsoc2013-evolution-fd28f516c5e1c4f9954ba1e0bf238e7c58271686.zip
Fix a compiler warning.
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. svn path=/trunk/; revision=34952
-rw-r--r--plugins/attachment-reminder/ChangeLog5
-rw-r--r--plugins/attachment-reminder/attachment-reminder.c2
-rw-r--r--widgets/ChangeLog6
-rw-r--r--widgets/text/e-text.c52
4 files changed, 12 insertions, 53 deletions
diff --git a/plugins/attachment-reminder/ChangeLog b/plugins/attachment-reminder/ChangeLog
index a8cdf93a9f..221d27e612 100644
--- a/plugins/attachment-reminder/ChangeLog
+++ b/plugins/attachment-reminder/ChangeLog
@@ -1,3 +1,8 @@
+2008-02-03 Matthew Barnes <mbarnes@redhat.com>
+
+ * attachment-reminder.c (org_gnome_evolution_attachment_reminder):
+ Fix a compiler warning.
+
2008-01-24 Johnny Jacob <jjohnny@novell.com>
** Fixes bug #503327 & #503678
diff --git a/plugins/attachment-reminder/attachment-reminder.c b/plugins/attachment-reminder/attachment-reminder.c
index b50fc5b9dc..968815bf0f 100644
--- a/plugins/attachment-reminder/attachment-reminder.c
+++ b/plugins/attachment-reminder/attachment-reminder.c
@@ -112,7 +112,7 @@ org_gnome_evolution_attachment_reminder (EPlugin *ep, EMEventTargetComposer *t)
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*/
diff --git a/widgets/ChangeLog b/widgets/ChangeLog
index bfe60097f6..7b352fd476 100644
--- a/widgets/ChangeLog
+++ b/widgets/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-03 Matthew Barnes <mbarnes@redhat.com>
+
+ * text/e-text.c (update_im_cursor_position):
+ * text/e-text.c (e_text_get_cursor_locations):
+ Remove these unused functions to silence compiler warnings.
+
2008-01-29 Matthew Barnes <mbarnes@redhat.com>
* menus/gal-view-collection.c:
diff --git a/widgets/text/e-text.c b/widgets/text/e-text.c
index 3648d2cfb0..69fc7498b7 100644
--- a/widgets/text/e-text.c
+++ b/widgets/text/e-text.c
@@ -132,7 +132,6 @@ static void e_text_insert(EText *text, const char *string);
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 @@ e_text_commit_cb (GtkIMContext *context,
}
}
-/*
- * 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)