From 702b642ccb80a59f204d9283993653495668df1c Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 11 Jun 2010 17:05:15 +1000 Subject: Require GTK+ 2.21.2 --- configure.ac | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/configure.ac b/configure.ac index 5ffe0de3f..b6539c13d 100644 --- a/configure.ac +++ b/configure.ac @@ -30,7 +30,7 @@ AC_COPYRIGHT([ # Minimal version required GLIB_REQUIRED=2.22.0 -GTK_REQUIRED=2.20.0 +GTK_REQUIRED=2.21.2 GCONF_REQUIRED=1.2.0 TELEPATHY_GLIB_REQUIRED=0.11.6 TELEPATHY_LOGGER=0.1.1 @@ -52,9 +52,9 @@ NAUTILUS_SENDTO_REQUIRED=2.28.1 # maintainer mode is forced ifelse(empathy_released, 1, [], [enable_maintainer_mode="yes"]) GNOME_MAINTAINER_MODE_DEFINES -#if test $USE_MAINTAINER_MODE = yes; then -# AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors]) -#fi +if test $USE_MAINTAINER_MODE = yes; then + AC_DEFINE(GSEAL_ENABLE, [], [Seal public structs to force usage of accessors]) +fi AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_HEADERS([config.h]) -- cgit v1.2.3 From 9e495e95ae426f691c8682285b698f84e0a942d3 Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Fri, 11 Jun 2010 17:05:49 +1000 Subject: Use new GtkTextView API to make EmpathyChat build with GSEAL enabled --- libempathy-gtk/empathy-chat.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libempathy-gtk/empathy-chat.c b/libempathy-gtk/empathy-chat.c index de36d6921..ae78b52cb 100644 --- a/libempathy-gtk/empathy-chat.c +++ b/libempathy-gtk/empathy-chat.c @@ -1559,8 +1559,8 @@ chat_input_key_press_event_cb (GtkWidget *widget, */ view = GTK_TEXT_VIEW (chat->input_text_view); - if (gtk_im_context_filter_keypress (view->im_context, event)) { - GTK_TEXT_VIEW (chat->input_text_view)->need_im_reset = TRUE; + if (gtk_text_view_im_context_filter_keypress (view, event)) { + gtk_text_view_reset_im_context (view); return TRUE; } -- cgit v1.2.3 From feda58b5da761dce7c18a2cb2d4531481fe3bfce Mon Sep 17 00:00:00 2001 From: Xavier Claessens Date: Wed, 5 May 2010 09:30:03 +0200 Subject: Use gtk_text_view_get_vadjustment() instead of assuming parent is a GtkScrolledWindow --- libempathy-gtk/empathy-chat-text-view.c | 45 ++++++++++----------------------- 1 file changed, 14 insertions(+), 31 deletions(-) diff --git a/libempathy-gtk/empathy-chat-text-view.c b/libempathy-gtk/empathy-chat-text-view.c index 9e31e4987..0f7400f1d 100644 --- a/libempathy-gtk/empathy-chat-text-view.c +++ b/libempathy-gtk/empathy-chat-text-view.c @@ -333,23 +333,18 @@ chat_text_view_populate_popup (EmpathyChatTextView *view, static gboolean chat_text_view_is_scrolled_down (EmpathyChatTextView *view) { - GtkWidget *sw; - - sw = gtk_widget_get_parent (GTK_WIDGET (view)); - if (GTK_IS_SCROLLED_WINDOW (sw)) { - GtkAdjustment *vadj; - gdouble value; - gdouble upper; - gdouble page_size; - - vadj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)); - value = gtk_adjustment_get_value (vadj); - upper = gtk_adjustment_get_upper (vadj); - page_size = gtk_adjustment_get_page_size (vadj); - - if (value < upper - page_size) { - return FALSE; - } + GtkAdjustment *vadj; + gdouble value; + gdouble upper; + gdouble page_size; + + vadj = gtk_text_view_get_vadjustment (GTK_TEXT_VIEW (view)); + value = gtk_adjustment_get_value (vadj); + upper = gtk_adjustment_get_upper (vadj); + page_size = gtk_adjustment_get_page_size (vadj); + + if (value < upper - page_size) { + return FALSE; } return TRUE; @@ -493,13 +488,8 @@ chat_text_view_size_allocate (GtkWidget *widget, if (down) { GtkAdjustment *adj; - GtkWidget *sw; - - sw = gtk_widget_get_parent (widget); - if (!GTK_IS_SCROLLED_WINDOW (sw)) - return; - adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)); + adj = gtk_text_view_get_vadjustment (GTK_TEXT_VIEW (widget)); gtk_adjustment_set_value (adj, gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj)); @@ -677,17 +667,10 @@ chat_text_view_scroll_cb (EmpathyChatTextView *view) EmpathyChatTextViewPriv *priv; GtkAdjustment *adj; gdouble max_val; - GtkWidget *sw; priv = GET_PRIV (view); - sw = gtk_widget_get_parent (GTK_WIDGET (view)); - if (!GTK_IS_SCROLLED_WINDOW (sw)) { - chat_text_view_scroll_stop (view); - return FALSE; - } - - adj = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (sw)); + adj = gtk_text_view_get_vadjustment (GTK_TEXT_VIEW (view)); max_val = gtk_adjustment_get_upper (adj) - gtk_adjustment_get_page_size (adj); g_return_val_if_fail (priv->scroll_time != NULL, FALSE); -- cgit v1.2.3 From 468edbcfb17c5d67d945debf2f019dfd9974ccf9 Mon Sep 17 00:00:00 2001 From: Danielle Madeley Date: Fri, 11 Jun 2010 17:51:39 +1000 Subject: Access GdkDragContext members via getters --- libempathy-gtk/empathy-avatar-chooser.c | 8 +++++--- libempathy-gtk/empathy-contact-list-view.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/libempathy-gtk/empathy-avatar-chooser.c b/libempathy-gtk/empathy-avatar-chooser.c index 6e6c28310..7a39f65f1 100644 --- a/libempathy-gtk/empathy-avatar-chooser.c +++ b/libempathy-gtk/empathy-avatar-chooser.c @@ -725,7 +725,8 @@ avatar_chooser_drag_motion_cb (GtkWidget *widget, priv = GET_PRIV (chooser); - for (p = context->targets; p != NULL; p = p->next) { + for (p = gdk_drag_context_list_targets (context); p != NULL; + p = p->next) { gchar *possible_type; possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data)); @@ -764,11 +765,12 @@ avatar_chooser_drag_drop_cb (GtkWidget *widget, priv = GET_PRIV (chooser); - if (context->targets == NULL) { + if (gdk_drag_context_list_targets (context) == NULL) { return FALSE; } - for (p = context->targets; p != NULL; p = p->next) { + for (p = gdk_drag_context_list_targets (context); + p != NULL; p = p->next) { char *possible_type; possible_type = gdk_atom_name (GDK_POINTER_TO_ATOM (p->data)); diff --git a/libempathy-gtk/empathy-contact-list-view.c b/libempathy-gtk/empathy-contact-list-view.c index 200524d25..8d0cd784f 100644 --- a/libempathy-gtk/empathy-contact-list-view.c +++ b/libempathy-gtk/empathy-contact-list-view.c @@ -448,7 +448,7 @@ contact_list_view_contact_drag_received (GtkWidget *view, data = g_slice_new0 (DndGetContactData); data->new_group = new_group; data->old_group = old_group; - data->action = context->action; + data->action = gdk_drag_context_get_selected_action (context); /* FIXME: We should probably wait for the cb before calling * gtk_drag_finish */ -- cgit v1.2.3