Mercurial > pidgin.yaz

comparison pidgin/gtkprefs.c @ 32335:98ae4b8b592f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
propagate from branch 'im.pidgin.pidgin' (head b55fa7e527d663bdb8c0320d6d035488e8446978) to branch 'im.pidgin.pidgin.mxit' (head 62c1402a9d54bdc07737fbefdfeb664eb5f01d81)
author pieter.loubser@mxit.com
date Thu, 11 Aug 2011 15:01:34 +0000
parents a8f62638417e
children 142429bcb4c8
comparison
equal deleted inserted replaced
32334:3951afa56940 32335:98ae4b8b592f
380 380
381 /* 381 /*
382 * LEAK - Gentoo memprof thinks pixbuf is leaking here... but it 382 * LEAK - Gentoo memprof thinks pixbuf is leaking here... but it
383 * looks like it should be ok to me. Anyone know what's up? --Mark 383 * looks like it should be ok to me. Anyone know what's up? --Mark
384 */ 384 */
385 pixbuf = (theme->icon ? gdk_pixbuf_new_from_file(theme->icon, NULL) : NULL); 385 pixbuf = (theme->icon ? pidgin_pixbuf_new_from_file(theme->icon) : NULL);
386 386
387 gtk_list_store_set(prefs_smiley_themes, &iter, 387 gtk_list_store_set(prefs_smiley_themes, &iter,
388 0, pixbuf, 388 0, pixbuf,
389 1, description, 389 1, description,
390 2, theme->name, 390 2, theme->name,
450 450
451 if (PURPLE_IS_SOUND_THEME(theme)){ 451 if (PURPLE_IS_SOUND_THEME(theme)){
452 452
453 image_full = purple_theme_get_image_full(theme); 453 image_full = purple_theme_get_image_full(theme);
454 if (image_full != NULL){ 454 if (image_full != NULL){
455 pixbuf = gdk_pixbuf_new_from_file_at_scale(image_full, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE, NULL); 455 pixbuf = pidgin_pixbuf_new_from_file_at_scale(image_full, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE);
456 g_free(image_full); 456 g_free(image_full);
457 } else 457 } else
458 pixbuf = NULL; 458 pixbuf = NULL;
459 459
460 gtk_list_store_append(prefs_sound_themes, &iter); 460 gtk_list_store_append(prefs_sound_themes, &iter);
471 else 471 else
472 store = prefs_status_icon_themes; 472 store = prefs_status_icon_themes;
473 473
474 image_full = purple_theme_get_image_full(theme); 474 image_full = purple_theme_get_image_full(theme);
475 if (image_full != NULL){ 475 if (image_full != NULL){
476 pixbuf = gdk_pixbuf_new_from_file_at_scale(image_full, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE, NULL); 476 pixbuf = pidgin_pixbuf_new_from_file_at_scale(image_full, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE);
477 g_free(image_full); 477 g_free(image_full);
478 } else 478 } else
479 pixbuf = NULL; 479 pixbuf = NULL;
480 480
481 name = purple_theme_get_name(theme); 481 name = purple_theme_get_name(theme);
527 prefs_sound_themes_loading = TRUE; 527 prefs_sound_themes_loading = TRUE;
528 /* refresh the list of themes in the manager */ 528 /* refresh the list of themes in the manager */
529 purple_theme_manager_refresh(); 529 purple_theme_manager_refresh();
530 530
531 tmp = g_build_filename(DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL); 531 tmp = g_build_filename(DATADIR, "icons", "hicolor", "32x32", "apps", "pidgin.png", NULL);
532 pixbuf = gdk_pixbuf_new_from_file_at_scale(tmp, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE, NULL); 532 pixbuf = pidgin_pixbuf_new_from_file_at_scale(tmp, PREFS_OPTIMAL_ICON_SIZE, PREFS_OPTIMAL_ICON_SIZE, TRUE);
533 g_free(tmp); 533 g_free(tmp);
534 534
535 /* sound themes */ 535 /* sound themes */
536 gtk_list_store_clear(prefs_sound_themes); 536 gtk_list_store_clear(prefs_sound_themes);
537 gtk_list_store_append(prefs_sound_themes, &iter); 537 gtk_list_store_append(prefs_sound_themes, &iter);
1446 GtkWidget *toolbar; 1446 GtkWidget *toolbar;
1447 GtkWidget *iconpref1; 1447 GtkWidget *iconpref1;
1448 GtkWidget *iconpref2; 1448 GtkWidget *iconpref2;
1449 GtkWidget *imhtml; 1449 GtkWidget *imhtml;
1450 GtkWidget *frame; 1450 GtkWidget *frame;
1451 GtkWidget *hbox;
1452 GtkWidget *checkbox;
1453 GtkWidget *spin_button;
1451 1454
1452 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE); 1455 ret = gtk_vbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
1453 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER); 1456 gtk_container_set_border_width(GTK_CONTAINER(ret), PIDGIN_HIG_BORDER);
1454 1457
1455 vbox = pidgin_make_frame(ret, _("Conversations")); 1458 vbox = pidgin_make_frame(ret, _("Conversations"));
1478 pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox); 1481 pidgin_prefs_checkbox(_("Use smooth-scrolling"), PIDGIN_PREFS_ROOT "/conversations/use_smooth_scrolling", vbox);
1479 1482
1480 #ifdef _WIN32 1483 #ifdef _WIN32
1481 pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox); 1484 pidgin_prefs_checkbox(_("F_lash window when IMs are received"), PIDGIN_PREFS_ROOT "/win32/blink_im", vbox);
1482 #endif 1485 #endif
1486 hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_BOX_SPACE);
1487
1488 checkbox = pidgin_prefs_checkbox(_("Resize incoming custom smileys"),
1489 PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys", hbox);
1490
1491 spin_button = pidgin_prefs_labeled_spin_button(hbox,
1492 _("Maximum size:"),
1493 PIDGIN_PREFS_ROOT "/conversations/custom_smileys_size",
1494 16, 512, NULL);
1495
1496 if (!purple_prefs_get_bool(
1497 PIDGIN_PREFS_ROOT "/conversations/resize_custom_smileys"))
1498 gtk_widget_set_sensitive(GTK_WIDGET(spin_button), FALSE);
1499
1500 g_signal_connect(G_OBJECT(checkbox), "clicked",
1501 G_CALLBACK(pidgin_toggle_sensitive), spin_button);
1502
1503 pidgin_add_widget_to_vbox(GTK_BOX(vbox), NULL, NULL, hbox, TRUE, NULL);
1483 1504
1484 pidgin_prefs_labeled_spin_button(vbox, 1505 pidgin_prefs_labeled_spin_button(vbox,
1485 _("Minimum input area height in lines:"), 1506 _("Minimum input area height in lines:"),
1486 PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines", 1507 PIDGIN_PREFS_ROOT "/conversations/minimum_entry_lines",
1487 1, 8, NULL); 1508 1, 8, NULL);