This is the patch to the wjt "send-button" branch.
I could not test it because when opening a chat window I get lots of
errors about creating the type EmpathyMessageEntry:
diff --git a/libempathy-gtk/empathy-message-entry.c b/libempathy-gtk/empathy-message-entry.c
index 1f4c4b8..575659d 100644
--- a/libempathy-gtk/empathy-message-entry.c
+++ b/libempathy-gtk/empathy-message-entry.c
@@ -93,24 +93,15 @@ static void
message_entry_update_icon_position (EmpathyMessageEntry *self)
{
EmpathyMessageEntryPrivate *priv = self->priv;
- GtkRequisition r;
- GdkRectangle rect;
- gint width, height;
-
- gtk_widget_get_child_requisition (priv->send_icon, &r);
-
- if (r.width != priv->icon_width)
- {
- DEBUG ("updating border window width to %d", r.width + 4);
- gtk_text_view_set_border_window_size (GTK_TEXT_VIEW (self), GTK_TEXT_WINDOW_RIGHT, r.width + 4);
- priv->icon_width = r.width;
- }
-
- gtk_text_view_get_visible_rect (GTK_TEXT_VIEW (self), &rect);
- DEBUG ("y = %u, height = %u", rect.y, rect.height);
- gtk_text_view_buffer_to_window_coords (GTK_TEXT_VIEW (self), GTK_TEXT_WINDOW_RIGHT, 2, rect.y + rect.height, &width, &height);
- DEBUG ("maps to height = %u", height);
- gtk_text_view_move_child (GTK_TEXT_VIEW (self), priv->send_icon_event_box, 2, height - r.height);
+ GtkTextView *input_text_view = self->parent;
+ GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (gtk_widget_get_parent (GTK_WIDGET (input_text_view)));
+ GtkRange *range = GTK_RANGE (gtk_scrolled_window_get_vscrollbar (scrolled_window));
+ GtkAdjustment *adj = gtk_range_get_adjustment (range);
+ int position = (int) gtk_adjustment_get_page_size (adj);
+
+ DEBUG ("called");
+
+ gtk_text_view_move_child (GTK_TEXT_VIEW (self), priv->send_icon_event_box, 2, position);
}
static void
diff --git a/libempathy-gtk/empathy-message-entry.h b/libempathy-gtk/empathy-message-entry.h
index 41ebacf..30657aa 100644
--- a/libempathy-gtk/empathy-message-entry.h
+++ b/libempathy-gtk/empathy-message-entry.h
@@ -46,7 +46,7 @@ G_BEGIN_DECLS
typedef struct _EmpathyMessageEntryPrivate EmpathyMessageEntryPrivate;
typedef struct {
- GtkTextView parent;
+ GtkTextView *parent;
EmpathyMessageEntryPrivate *priv;
} EmpathyMessageEntry;
_______________________________________________
telepathy mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/telepathy
