comparison: pidgin/gtkutils.c
pidgin/gtkutils.c
- changeset 15882
- 1dbd5756b7bf
- parent 15799
- ba7af742a0d1
- child 15883
- 969b74a3e27a
equal
deleted
inserted
replaced
| 15880:d275b025481c | 15882:1dbd5756b7bf |
|---|---|
| 398 pidgin_make_frame(GtkWidget *parent, const char *title) | 398 pidgin_make_frame(GtkWidget *parent, const char *title) |
| 399 { | 399 { |
| 400 GtkWidget *vbox, *label, *hbox; | 400 GtkWidget *vbox, *label, *hbox; |
| 401 char *labeltitle; | 401 char *labeltitle; |
| 402 | 402 |
| 403 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); | 403 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 404 gtk_box_pack_start(GTK_BOX(parent), vbox, FALSE, FALSE, 0); | 404 gtk_box_pack_start(GTK_BOX(parent), vbox, FALSE, FALSE, 0); |
| 405 gtk_widget_show(vbox); | 405 gtk_widget_show(vbox); |
| 406 | 406 |
| 407 label = gtk_label_new(NULL); | 407 label = gtk_label_new(NULL); |
| 408 | 408 |
| 413 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 413 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 414 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); | 414 gtk_box_pack_start(GTK_BOX(vbox), label, FALSE, FALSE, 0); |
| 415 gtk_widget_show(label); | 415 gtk_widget_show(label); |
| 416 pidgin_set_accessible_label (vbox, label); | 416 pidgin_set_accessible_label (vbox, label); |
| 417 | 417 |
| 418 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); | 418 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 419 gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); | 419 gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); |
| 420 gtk_widget_show(hbox); | 420 gtk_widget_show(hbox); |
| 421 | 421 |
| 422 label = gtk_label_new(" "); | 422 label = gtk_label_new(" "); |
| 423 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); | 423 gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); |
| 424 gtk_widget_show(label); | 424 gtk_widget_show(label); |
| 425 | 425 |
| 426 vbox = gtk_vbox_new(FALSE, GAIM_HIG_BOX_SPACE); | 426 vbox = gtk_vbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 427 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); | 427 gtk_box_pack_start(GTK_BOX(hbox), vbox, FALSE, FALSE, 0); |
| 428 gtk_widget_show(vbox); | 428 gtk_widget_show(vbox); |
| 429 | 429 |
| 430 return vbox; | 430 return vbox; |
| 431 } | 431 } |
| 2357 if ((current_folder != NULL) && (*current_folder != '\0')) | 2357 if ((current_folder != NULL) && (*current_folder != '\0')) |
| 2358 gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog->icon_filesel), | 2358 gtk_file_selection_set_filename(GTK_FILE_SELECTION(dialog->icon_filesel), |
| 2359 current_folder); | 2359 current_folder); |
| 2360 | 2360 |
| 2361 gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50); | 2361 gtk_widget_set_size_request(GTK_WIDGET(dialog->icon_preview), -1, 50); |
| 2362 hbox = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); | 2362 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 2363 gtk_box_pack_start( | 2363 gtk_box_pack_start( |
| 2364 GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox), | 2364 GTK_BOX(GTK_FILE_SELECTION(dialog->icon_filesel)->main_vbox), |
| 2365 hbox, FALSE, FALSE, 0); | 2365 hbox, FALSE, FALSE, 0); |
| 2366 gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_preview, | 2366 gtk_box_pack_end(GTK_BOX(hbox), dialog->icon_preview, |
| 2367 FALSE, FALSE, 0); | 2367 FALSE, FALSE, 0); |
| 2907 | 2907 |
| 2908 img = gtk_image_new_from_stock(icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); | 2908 img = gtk_image_new_from_stock(icon_name, gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_EXTRA_SMALL)); |
| 2909 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); | 2909 gtk_misc_set_alignment(GTK_MISC(img), 0, 0); |
| 2910 | 2910 |
| 2911 vbox = gtk_vbox_new(FALSE,0); | 2911 vbox = gtk_vbox_new(FALSE,0); |
| 2912 gtk_container_set_border_width(GTK_CONTAINER(vbox), GAIM_HIG_BOX_SPACE); | 2912 gtk_container_set_border_width(GTK_CONTAINER(vbox), PIDGIN_HIG_BOX_SPACE); |
| 2913 | 2913 |
| 2914 g_object_set_data(G_OBJECT(vbox), "gc" ,gc); | 2914 g_object_set_data(G_OBJECT(vbox), "gc" ,gc); |
| 2915 minidialogs = g_slist_prepend(minidialogs, vbox); | 2915 minidialogs = g_slist_prepend(minidialogs, vbox); |
| 2916 g_signal_connect(G_OBJECT(vbox), "destroy", G_CALLBACK(alert_killed_cb), NULL); | 2916 g_signal_connect(G_OBJECT(vbox), "destroy", G_CALLBACK(alert_killed_cb), NULL); |
| 2917 | 2917 |
| 2941 gtk_label_set_markup(GTK_LABEL(label), label_text); | 2941 gtk_label_set_markup(GTK_LABEL(label), label_text); |
| 2942 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); | 2942 gtk_label_set_line_wrap(GTK_LABEL(label), TRUE); |
| 2943 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); | 2943 gtk_misc_set_alignment(GTK_MISC(label), 0, 0); |
| 2944 gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); | 2944 gtk_box_pack_start(GTK_BOX(hbox), label, TRUE, TRUE, 0); |
| 2945 | 2945 |
| 2946 hbox2 = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); | 2946 hbox2 = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE); |
| 2947 gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0); | 2947 gtk_box_pack_start(GTK_BOX(vbox), hbox2, FALSE, FALSE, 0); |
| 2948 | 2948 |
| 2949 va_start(args, user_data); | 2949 va_start(args, user_data); |
| 2950 while ((button_text = va_arg(args, char*))) { | 2950 while ((button_text = va_arg(args, char*))) { |
| 2951 callback = va_arg(args, GCallback); | 2951 callback = va_arg(args, GCallback); |
