Mercurial > pidgin
comparison pidgin/gtkutils.c @ 32686:3538e783b98c
Fix all deprecated GTK_WIDGET_* macros.
| author | Elliott Sales de Andrade <qulogic@pidgin.im> |
|---|---|
| date | Sun, 09 Oct 2011 02:50:20 +0000 |
| parents | 787609e41f20 |
| children | 763d65f3f758 |
comparison
equal
deleted
inserted
replaced
| 32685:457443ca22e0 | 32686:3538e783b98c |
|---|---|
| 68 #include "gtkthemes.h" | 68 #include "gtkthemes.h" |
| 69 #include "gtkutils.h" | 69 #include "gtkutils.h" |
| 70 #include "gtkwebview.h" | 70 #include "gtkwebview.h" |
| 71 #include "pidgin/minidialog.h" | 71 #include "pidgin/minidialog.h" |
| 72 | 72 |
| 73 #if !GTK_CHECK_VERSION(2,18,0) | |
| 74 #define gtk_widget_get_visible(x) GTK_WIDGET_VISIBLE(x) | |
| 75 #define gtk_widget_is_sensitive(x) GTK_WIDGET_IS_SENSITIVE(x) | |
| 76 #endif | |
| 77 | |
| 73 typedef struct { | 78 typedef struct { |
| 74 GtkTreeModel *model; | 79 GtkTreeModel *model; |
| 75 gint default_item; | 80 gint default_item; |
| 76 } AopMenu; | 81 } AopMenu; |
| 77 | 82 |
| 354 gboolean sensitivity; | 359 gboolean sensitivity; |
| 355 | 360 |
| 356 if (to_toggle == NULL) | 361 if (to_toggle == NULL) |
| 357 return; | 362 return; |
| 358 | 363 |
| 359 sensitivity = GTK_WIDGET_IS_SENSITIVE(to_toggle); | 364 sensitivity = gtk_widget_is_sensitive(to_toggle); |
| 360 | 365 |
| 361 gtk_widget_set_sensitive(to_toggle, !sensitivity); | 366 gtk_widget_set_sensitive(to_toggle, !sensitivity); |
| 362 } | 367 } |
| 363 | 368 |
| 364 void | 369 void |
| 371 for (i=0; i < data->len; i++) { | 376 for (i=0; i < data->len; i++) { |
| 372 element = g_ptr_array_index(data,i); | 377 element = g_ptr_array_index(data,i); |
| 373 if (element == NULL) | 378 if (element == NULL) |
| 374 continue; | 379 continue; |
| 375 | 380 |
| 376 sensitivity = GTK_WIDGET_IS_SENSITIVE(element); | 381 sensitivity = gtk_widget_is_sensitive(element); |
| 377 | 382 |
| 378 gtk_widget_set_sensitive(element, !sensitivity); | 383 gtk_widget_set_sensitive(element, !sensitivity); |
| 379 } | 384 } |
| 380 } | 385 } |
| 381 | 386 |
| 383 pidgin_toggle_showhide(GtkWidget *widget, GtkWidget *to_toggle) | 388 pidgin_toggle_showhide(GtkWidget *widget, GtkWidget *to_toggle) |
| 384 { | 389 { |
| 385 if (to_toggle == NULL) | 390 if (to_toggle == NULL) |
| 386 return; | 391 return; |
| 387 | 392 |
| 388 if (GTK_WIDGET_VISIBLE(to_toggle)) | 393 if (gtk_widget_get_visible(to_toggle)) |
| 389 gtk_widget_hide(to_toggle); | 394 gtk_widget_hide(to_toggle); |
| 390 else | 395 else |
| 391 gtk_widget_show(to_toggle); | 396 gtk_widget_show(to_toggle); |
| 392 } | 397 } |
| 393 | 398 |
| 2989 time_t value; | 2994 time_t value; |
| 2990 | 2995 |
| 2991 windows = g_list_delete_link(windows, windows); | 2996 windows = g_list_delete_link(windows, windows); |
| 2992 | 2997 |
| 2993 if (window == widget || | 2998 if (window == widget || |
| 2994 !GTK_WIDGET_VISIBLE(window)) | 2999 !gtk_widget_get_visible(window)) |
| 2995 continue; | 3000 continue; |
| 2996 | 3001 |
| 2997 if (!gdk_property_get(window->window, _WindowTime, _Cardinal, 0, sizeof(time_t), FALSE, | 3002 if (!gdk_property_get(window->window, _WindowTime, _Cardinal, 0, sizeof(time_t), FALSE, |
| 2998 NULL, NULL, &al, &data)) | 3003 NULL, NULL, &al, &data)) |
| 2999 continue; | 3004 continue; |
| 3043 while (windows) { | 3048 while (windows) { |
| 3044 GtkWidget *window = windows->data; | 3049 GtkWidget *window = windows->data; |
| 3045 windows = g_list_delete_link(windows, windows); | 3050 windows = g_list_delete_link(windows, windows); |
| 3046 | 3051 |
| 3047 if (window == widget || | 3052 if (window == widget || |
| 3048 !GTK_WIDGET_VISIBLE(window)) { | 3053 !gtk_widget_get_visible(window)) { |
| 3049 continue; | 3054 continue; |
| 3050 } | 3055 } |
| 3051 | 3056 |
| 3052 if (gtk_window_has_toplevel_focus(GTK_WINDOW(window)) || | 3057 if (gtk_window_has_toplevel_focus(GTK_WINDOW(window)) || |
| 3053 (menu && menu == window->window)) { | 3058 (menu && menu == window->window)) { |