comparison: pidgin/gtklog.c
pidgin/gtklog.c
- changeset 15500
- 86b86eab98a4
- parent 15497
- 92f02f4bd5ee
- child 15562
- 8c8249fe5e3c
equal
deleted
inserted
replaced
| 15486:06bb8277e42c | 15500:86b86eab98a4 |
|---|---|
| 363 G_CALLBACK(destroy_cb), ht); | 363 G_CALLBACK(destroy_cb), ht); |
| 364 gtk_window_set_role(GTK_WINDOW(lv->window), "log_viewer"); | 364 gtk_window_set_role(GTK_WINDOW(lv->window), "log_viewer"); |
| 365 | 365 |
| 366 /* Icon *************/ | 366 /* Icon *************/ |
| 367 if (pixbuf != NULL) { | 367 if (pixbuf != NULL) { |
| 368 GdkPixbuf *scale; | |
| 369 GtkWidget *icon; | 368 GtkWidget *icon; |
| 370 | 369 |
| 371 title_box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); | 370 title_box = gtk_hbox_new(FALSE, GAIM_HIG_BOX_SPACE); |
| 372 gtk_container_set_border_width(GTK_CONTAINER(title_box), GAIM_HIG_BOX_SPACE); | 371 gtk_container_set_border_width(GTK_CONTAINER(title_box), GAIM_HIG_BOX_SPACE); |
| 373 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); | 372 gtk_box_pack_start(GTK_BOX(GTK_DIALOG(lv->window)->vbox), title_box, FALSE, FALSE, 0); |
| 374 | 373 |
| 375 scale = gdk_pixbuf_scale_simple(pixbuf, 16, 16, GDK_INTERP_BILINEAR); | 374 icon = gtk_image_new_from_pixbuf(pixbuf); |
| 376 icon = gtk_image_new_from_pixbuf(scale); | |
| 377 gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); | 375 gtk_box_pack_start(GTK_BOX(title_box), icon, FALSE, FALSE, 0); |
| 378 g_object_unref(G_OBJECT(pixbuf)); | 376 g_object_unref(G_OBJECT(pixbuf)); |
| 379 g_object_unref(G_OBJECT(scale)); | |
| 380 } else | 377 } else |
| 381 title_box = GTK_DIALOG(lv->window)->vbox; | 378 title_box = GTK_DIALOG(lv->window)->vbox; |
| 382 | 379 |
| 383 /* Label ************/ | 380 /* Label ************/ |
| 384 lv->label = gtk_label_new(NULL); | 381 lv->label = gtk_label_new(NULL); |
| 501 | 498 |
| 502 title = g_strdup_printf(_("Conversations with %s"), name); | 499 title = g_strdup_printf(_("Conversations with %s"), name); |
| 503 } | 500 } |
| 504 | 501 |
| 505 display_log_viewer(ht, gaim_log_get_logs(type, screenname, account), | 502 display_log_viewer(ht, gaim_log_get_logs(type, screenname, account), |
| 506 title, gaim_gtk_create_prpl_icon(account, 0.5), gaim_log_get_total_size(type, screenname, account)); | 503 title, gaim_gtk_create_prpl_icon(account, PIDGIN_PRPL_ICON_MEDIUM), |
| 504 gaim_log_get_total_size(type, screenname, account)); | |
| 507 g_free(title); | 505 g_free(title); |
| 508 } | 506 } |
| 509 | 507 |
| 510 void gaim_gtk_log_show_contact(GaimContact *contact) { | 508 void gaim_gtk_log_show_contact(GaimContact *contact) { |
| 511 struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1); | 509 struct log_viewer_hash_t *ht = g_new0(struct log_viewer_hash_t, 1); |
