summaryrefslogtreecommitdiff
path: root/libedataserverui/e-name-selector-list.c
diff options
context:
space:
mode:
authorMatthew Barnes <mbarnes@redhat.com>2009-01-14 20:20:25 +0000
committerMatthew Barnes <mbarnes@src.gnome.org>2009-01-14 20:20:25 +0000
commitedd2593ab92a354c0e3660a94414df077c6cf8e3 (patch)
treea1b4b3fa578f40048a3ca8fc07c2bcd810b44a86 /libedataserverui/e-name-selector-list.c
parent6732e607d672ad7abe850d5ba09430faa454cfcc (diff)
downloadevolution-data-server-edd2593ab92a354c0e3660a94414df077c6cf8e3.tar.gz
** Fixes bug #564543
2009-01-14 Matthew Barnes <mbarnes@redhat.com> ** Fixes bug #564543 * configure.in: Bump gtk_minimum_version to 2.14.0. * libedataserverui/e-categories-dialog.c: * libedataserverui/e-cell-renderer-color.c: * libedataserverui/e-contact-store.h: * libedataserverui/e-destination-store.h: * libedataserverui/e-name-selector-dialog.c: * libedataserverui/e-name-selector-dialog.h: * libedataserverui/e-name-selector-entry.h: * libedataserverui/e-name-selector-list.c: * libedataserverui/e-passwords.c: * libedataserverui/e-source-option-menu.c: * libedataserverui/e-source-selector-dialog.c: * libedataserverui/e-tree-model-generator.c: * libedataserverui/e-tree-model-generator.h: Fix what we can with GSEAL_ENABLE defined. * calendar/backends/caldav/e-cal-backend-caldav.c (caldav_debug_setup): * servers/exchange/lib/e2k-context.c (e2k_context_set_auth): Call soup_session_add_feature() instead of soup_logger_attach(). * servers/exchange/lib/e2k-context.c (e2k_context_fba): * servers/google/libgdata-google/gdata-google-service.c (gdata_google_service_authenticate): Call soup_form_encode_hash() instead of soup_form_encode_urlencoded(). svn path=/trunk/; revision=9932
Diffstat (limited to 'libedataserverui/e-name-selector-list.c')
-rw-r--r--libedataserverui/e-name-selector-list.c15
1 files changed, 11 insertions, 4 deletions
diff --git a/libedataserverui/e-name-selector-list.c b/libedataserverui/e-name-selector-list.c
index e7f965ea4..b1b35e939 100644
--- a/libedataserverui/e-name-selector-list.c
+++ b/libedataserverui/e-name-selector-list.c
@@ -71,10 +71,12 @@ enl_popup_size (ENameSelectorList *list)
static void
enl_popup_position (ENameSelectorList *list)
{
+ GdkWindow *window;
int x,y;
enl_popup_size (list);
- gdk_window_get_origin (((GtkWidget *)list)->window, &x, &y);
+ window = gtk_widget_get_window (GTK_WIDGET (list));
+ gdk_window_get_origin (window, &x, &y);
y = y +((GtkWidget *)list)->allocation.height;
gtk_window_move (list->popup, x, y);
@@ -83,17 +85,20 @@ enl_popup_position (ENameSelectorList *list)
static void
enl_popup_grab (ENameSelectorList *list)
{
+ GdkWindow *window;
int len;
+ window = gtk_widget_get_window (GTK_WIDGET (list->popup));
+
gtk_grab_add (GTK_WIDGET (list->popup));
- gdk_pointer_grab (((GtkWidget *)list->popup)->window, TRUE,
+ gdk_pointer_grab (window, TRUE,
GDK_BUTTON_PRESS_MASK |
GDK_BUTTON_RELEASE_MASK |
GDK_POINTER_MOTION_MASK,
NULL, NULL, GDK_CURRENT_TIME);
- gdk_keyboard_grab (((GtkWidget *)list->popup)->window, TRUE, GDK_CURRENT_TIME);
+ gdk_keyboard_grab (window, TRUE, GDK_CURRENT_TIME);
gtk_widget_grab_focus ((GtkWidget *)list);
/* Build the listview from the model */
@@ -610,7 +615,9 @@ e_name_selector_list_init (ENameSelectorList *list)
GTK_POLICY_AUTOMATIC);
gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (scroll),
GTK_SHADOW_NONE);
- gtk_widget_set_size_request (GTK_SCROLLED_WINDOW (scroll)->vscrollbar, -1, 0);
+ gtk_widget_set_size_request (
+ gtk_scrolled_window_get_vscrollbar (
+ GTK_SCROLLED_WINDOW (scroll)), -1, 0);
list->popup = GTK_WINDOW (gtk_window_new (GTK_WINDOW_POPUP));
gtk_window_set_resizable (GTK_WINDOW (list->popup), FALSE);