comparison: pidgin/gtkdialogs.c
pidgin/gtkdialogs.c
- branch
- cpw.qulogic.gtk3-required
- changeset 33170
- ce4447562d64
- parent 33160
- 4ddceddab409
- child 33213
- 2852fbde4722
equal
deleted
inserted
replaced
| 33169:1f676cd20646 | 33170:ce4447562d64 |
|---|---|
| 41 #include "gtkdialogs.h" | 41 #include "gtkdialogs.h" |
| 42 #include "gtklog.h" | 42 #include "gtklog.h" |
| 43 #include "gtkutils.h" | 43 #include "gtkutils.h" |
| 44 #include "gtkwebview.h" | 44 #include "gtkwebview.h" |
| 45 #include "pidginstock.h" | 45 #include "pidginstock.h" |
| 46 | |
| 47 #include "gtk3compat.h" | |
| 46 | 48 |
| 47 static GList *dialogwindows = NULL; | 49 static GList *dialogwindows = NULL; |
| 48 | 50 |
| 49 struct _PidginGroupMergeObject { | 51 struct _PidginGroupMergeObject { |
| 50 PurpleGroup* parent; | 52 PurpleGroup* parent; |
| 433 GtkWidget *win, *vbox, *frame, *logo, *webview, *button; | 435 GtkWidget *win, *vbox, *frame, *logo, *webview, *button; |
| 434 GdkPixbuf *pixbuf; | 436 GdkPixbuf *pixbuf; |
| 435 AtkObject *obj; | 437 AtkObject *obj; |
| 436 char *filename, *tmp; | 438 char *filename, *tmp; |
| 437 | 439 |
| 440 #if GTK_CHECK_VERSION(3,0,0) | |
| 438 win = pidgin_create_dialog(title, 0, role, TRUE); | 441 win = pidgin_create_dialog(title, 0, role, TRUE); |
| 439 vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 0); | 442 vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, 0); |
| 443 #else | |
| 444 win = pidgin_create_dialog(title, PIDGIN_HIG_BORDER, role, TRUE); | |
| 445 vbox = pidgin_dialog_get_vbox_with_properties(GTK_DIALOG(win), FALSE, PIDGIN_HIG_BORDER); | |
| 446 #endif | |
| 440 gtk_window_set_default_size(GTK_WINDOW(win), 475, 450); | 447 gtk_window_set_default_size(GTK_WINDOW(win), 475, 450); |
| 441 | 448 |
| 442 /* Generate a logo with a version number */ | 449 /* Generate a logo with a version number */ |
| 443 filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL); | 450 filename = g_build_filename(DATADIR, "pixmaps", "pidgin", "logo.png", NULL); |
| 444 pixbuf = pidgin_pixbuf_new_from_file(filename); | 451 pixbuf = pidgin_pixbuf_new_from_file(filename); |
