projects / claws.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
2011-10-09 [colin] 3.7.10cvs27
[claws.git] / src / addr_compl.c
diff --git a/src/addr_compl.c b/src/addr_compl.c
index 03b9581d8b3860e46a508a1d70ab5fe45dcff1ee..c0ded1fbe5351dfaed19ce59c0b1755780484b91 100644 (file)
--- a/src/addr_compl.c
+++ b/src/addr_compl.c
@@ -23,11 +23,6 @@
 #endif
 #include "defs.h"
 
-/* We know this file uses some deprecated stuff. */
-#undef G_DISABLE_DEPRECATED
-#undef GTK_DISABLE_DEPRECATED
-#undef GDK_DISABLE_DEPRECATED
-
 #include <glib.h>
 #include <glib/gi18n.h>
 #include <gdk/gdkkeysyms.h>
@@ -848,9 +843,10 @@ static void addrcompl_resize_window( CompletionWindow *cw ) {
        gint x, y, width, height, depth;
 
        /* Get current geometry of window */
-       gdk_window_get_geometry( cw->window->window, &x, &y, &width, &height, &depth );
+       gdk_window_get_geometry( gtk_widget_get_window( cw->window ), &x, &y, &width, &height, &depth );
 
-       gtk_widget_hide( cw->window );
+       /* simple _hide breaks size requisition !? */
+       gtk_widget_hide_all( cw->window );
        gtk_widget_show_all( cw->window );
        gtk_widget_size_request( cw->list_view, &r );
 
@@ -1107,7 +1103,7 @@ static void completion_window_apply_selection(GtkTreeView *list_view,
        g_free(text);
 
        /* Move focus to next widget */
-       parent = GTK_WIDGET(entry)->parent;
+       parent = gtk_widget_get_parent(GTK_WIDGET(entry));
        if( parent && move_focus) {
                gtk_widget_child_focus( parent, GTK_DIR_TAB_FORWARD );
        }
@@ -1162,7 +1158,7 @@ void address_completion_register_entry(GtkEntry *entry, gboolean allow_commas)
  */
 void address_completion_unregister_entry(GtkEntry *entry)
 {
-       GtkObject *entry_obj;
+       GObject *entry_obj;
 
        cm_return_if_fail(entry != NULL);
        cm_return_if_fail(GTK_IS_ENTRY(entry));
@@ -1217,14 +1213,14 @@ static gboolean address_completion_entry_key_pressed(GtkEntry    *entry,
                                                     GdkEventKey *ev,
                                                     gpointer     data)
 {
-       if (ev->keyval == GDK_Tab) {
+       if (ev->keyval == GDK_KEY_Tab) {
                addrcompl_clear_queue();
                _allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), ENTRY_DATA_ALLOW_COMMAS));
                if( address_completion_complete_address_in_entry( entry, TRUE ) ) {
                        /* route a void character to the default handler */
                        /* this is a dirty hack; we're actually changing a key
                         * reported by the system. */
-                       ev->keyval = GDK_AudibleBell_Enable;
+                       ev->keyval = GDK_KEY_AudibleBell_Enable;
                        ev->state &= ~GDK_SHIFT_MASK;
 
                        /* Create window */                     
@@ -1238,16 +1234,16 @@ static gboolean address_completion_entry_key_pressed(GtkEntry    *entry,
                else {
                        /* old behaviour */
                }
-       } else if (ev->keyval == GDK_Shift_L
-               || ev->keyval == GDK_Shift_R
-               || ev->keyval == GDK_Control_L
-               || ev->keyval == GDK_Control_R
-               || ev->keyval == GDK_Caps_Lock
-               || ev->keyval == GDK_Shift_Lock
-               || ev->keyval == GDK_Meta_L
-               || ev->keyval == GDK_Meta_R
-               || ev->keyval == GDK_Alt_L
-               || ev->keyval == GDK_Alt_R) {
+       } else if (ev->keyval == GDK_KEY_Shift_L
+               || ev->keyval == GDK_KEY_Shift_R
+               || ev->keyval == GDK_KEY_Control_L
+               || ev->keyval == GDK_KEY_Control_R
+               || ev->keyval == GDK_KEY_Caps_Lock
+               || ev->keyval == GDK_KEY_Shift_Lock
+               || ev->keyval == GDK_KEY_Meta_L
+               || ev->keyval == GDK_KEY_Meta_R
+               || ev->keyval == GDK_KEY_Alt_L
+               || ev->keyval == GDK_KEY_Alt_R) {
                /* these buttons should not clear the cache... */
        } else
                clear_completion_cache();
@@ -1317,6 +1313,7 @@ static void address_completion_create_completion_window( GtkEntry *entry_ )
        GtkRequisition r;
        GtkWidget *window;
        GtkWidget *entry = GTK_WIDGET(entry_);
+       GdkWindow *gdkwin;
 
        /* Create new window and list */
        window = gtk_window_new(GTK_WINDOW_POPUP);
@@ -1340,8 +1337,9 @@ static void address_completion_create_completion_window( GtkEntry *entry_ )
        gtk_scrolled_window_set_shadow_type(GTK_SCROLLED_WINDOW(scroll),
                GTK_SHADOW_OUT);
        /* Use entry widget to create initial window */
-       gdk_window_get_geometry(entry->window, &x, &y, &width, &height, &depth);
-       gdk_window_get_origin (entry->window, &x, &y);
+       gdkwin = gtk_widget_get_window(entry),
+       gdk_window_get_geometry(gdkwin, &x, &y, &width, &height, &depth);
+       gdk_window_get_origin (gdkwin, &x, &y);
        y += height;
        gtk_window_move(GTK_WINDOW(window), x, y);
 
@@ -1368,7 +1366,7 @@ static void address_completion_create_completion_window( GtkEntry *entry_ )
                         "key-press-event",
                         G_CALLBACK(completion_window_key_press),
                         _compWindow_ );
-       gdk_pointer_grab(window->window, TRUE,
+       gdk_pointer_grab(gtk_widget_get_window(window), TRUE,
                         GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK |
                         GDK_BUTTON_RELEASE_MASK,
                         NULL, NULL, GDK_CURRENT_TIME);
@@ -1414,7 +1412,7 @@ static gboolean completion_window_button_press(GtkWidget *widget,
                                restore = FALSE;
                                break;
                        }
-                       event_widget = event_widget->parent;
+                       event_widget = gtk_widget_get_parent(event_widget);
                }
        }
 
@@ -1454,19 +1452,19 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        cm_return_val_if_fail(entry != NULL, FALSE);
 
        /* allow keyboard navigation in the alternatives tree view */
-       if (event->keyval == GDK_Up || event->keyval == GDK_Down ||
-           event->keyval == GDK_Page_Up || event->keyval == GDK_Page_Down) {
+       if (event->keyval == GDK_KEY_Up || event->keyval == GDK_KEY_Down ||
+           event->keyval == GDK_KEY_Page_Up || event->keyval == GDK_KEY_Page_Down) {
                completion_window_advance_selection
                        (GTK_TREE_VIEW(list_view),
-                        event->keyval == GDK_Down ||
-                        event->keyval == GDK_Page_Down ? TRUE : FALSE);
+                        event->keyval == GDK_KEY_Down ||
+                        event->keyval == GDK_KEY_Page_Down ? TRUE : FALSE);
                return FALSE;
        }               
 
        /* make tab move to next field */
-       if( event->keyval == GDK_Tab ) {
+       if( event->keyval == GDK_KEY_Tab ) {
                /* Reference to parent */
-               parent = GTK_WIDGET(entry)->parent;
+               parent = gtk_widget_get_parent(GTK_WIDGET(entry));
 
                /* Discard the window */
                clear_completion_cache();
@@ -1480,9 +1478,9 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        }
 
        /* make backtab move to previous field */
-       if( event->keyval == GDK_ISO_Left_Tab ) {
+       if( event->keyval == GDK_KEY_ISO_Left_Tab ) {
                /* Reference to parent */
-               parent = GTK_WIDGET(entry)->parent;
+               parent = gtk_widget_get_parent(GTK_WIDGET(entry));
 
                /* Discard the window */
                clear_completion_cache();
@@ -1497,17 +1495,17 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        _allowCommas_ = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(entry), ENTRY_DATA_ALLOW_COMMAS));
 
        /* look for presses that accept the selection */
-       if (event->keyval == GDK_Return || event->keyval == GDK_space ||
-                       event->keyval == GDK_KP_Enter ||
-                       (_allowCommas_ && event->keyval == GDK_comma)) {
+       if (event->keyval == GDK_KEY_Return || event->keyval == GDK_KEY_space ||
+                       event->keyval == GDK_KEY_KP_Enter ||
+                       (_allowCommas_ && event->keyval == GDK_KEY_comma)) {
                /* User selected address with a key press */
 
                /* Display selected address in entry field */           
                completion_window_apply_selection(
                        GTK_TREE_VIEW(list_view), GTK_ENTRY(entry),
-                       event->keyval != GDK_comma);
+                       event->keyval != GDK_KEY_comma);
 
-               if (event->keyval == GDK_comma) {
+               if (event->keyval == GDK_KEY_comma) {
                        gint pos = gtk_editable_get_position(GTK_EDITABLE(entry));
                        gtk_editable_insert_text(GTK_EDITABLE(entry), ", ", 2, &pos);
                        gtk_editable_set_position(GTK_EDITABLE(entry), pos + 1);
@@ -1520,16 +1518,16 @@ static gboolean completion_window_key_press(GtkWidget *widget,
        }
 
        /* key state keys should never be handled */
-       if (event->keyval == GDK_Shift_L
-                || event->keyval == GDK_Shift_R
-                || event->keyval == GDK_Control_L
-                || event->keyval == GDK_Control_R
-                || event->keyval == GDK_Caps_Lock
-                || event->keyval == GDK_Shift_Lock
-                || event->keyval == GDK_Meta_L
-                || event->keyval == GDK_Meta_R
-                || event->keyval == GDK_Alt_L
-                || event->keyval == GDK_Alt_R) {
+       if (event->keyval == GDK_KEY_Shift_L
+                || event->keyval == GDK_KEY_Shift_R
+                || event->keyval == GDK_KEY_Control_L
+                || event->keyval == GDK_KEY_Control_R
+                || event->keyval == GDK_KEY_Caps_Lock
+                || event->keyval == GDK_KEY_Shift_Lock
+                || event->keyval == GDK_KEY_Meta_L
+                || event->keyval == GDK_KEY_Meta_R
+                || event->keyval == GDK_KEY_Alt_L
+                || event->keyval == GDK_KEY_Alt_R) {
                return FALSE;
        }
 
@@ -1540,7 +1538,7 @@ static gboolean completion_window_key_press(GtkWidget *widget,
 
        /* make sure anything we typed comes in the edit box */
        tmp_event.type       = event->type;
-       tmp_event.window     = entry->window;
+       tmp_event.window     = gtk_widget_get_window(GTK_WIDGET(entry));
        tmp_event.send_event = TRUE;
        tmp_event.time       = event->time;
        tmp_event.state      = event->state;
Claws Mail