Mercurial > pidgin.yaz
comparison pidgin/gtkprefs.c @ 21353:8ae227dca885
merge of '00bf7296307f96f5c68d6e5edf219fb4a50bb947'
and '3468b1f73a715bd59ad22726232214da77cf67f7'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 16 Nov 2007 23:27:07 +0000 |
parents | d4f95419be45 73c5f5bfeb39 |
children | fcb848b2d669 |
comparison
equal
deleted
inserted
replaced
21352:ca17c133d6c3 | 21353:8ae227dca885 |
---|---|
640 | 640 |
641 static void | 641 static void |
642 add_theme_button_clicked_cb(GtkWidget *widget, gpointer null) | 642 add_theme_button_clicked_cb(GtkWidget *widget, gpointer null) |
643 { | 643 { |
644 purple_request_file_with_hint(NULL, _("Install Theme"), NULL, FALSE, | 644 purple_request_file_with_hint(NULL, _("Install Theme"), NULL, FALSE, |
645 (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, PURPLE_UI_REQUEST_HINT_PREFSMGR, NULL) ; | 645 (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, "preferences", NULL) ; |
646 } | 646 } |
647 | 647 |
648 static void | 648 static void |
649 remove_theme_button_clicked_cb(GtkWidget *button, GtkTreeView *tv) | 649 remove_theme_button_clicked_cb(GtkWidget *button, GtkTreeView *tv) |
650 { | 650 { |
1625 if (*filename == '\0') | 1625 if (*filename == '\0') |
1626 filename = NULL; | 1626 filename = NULL; |
1627 | 1627 |
1628 purple_request_file_with_hint(prefs, _("Sound Selection"), filename, FALSE, | 1628 purple_request_file_with_hint(prefs, _("Sound Selection"), filename, FALSE, |
1629 G_CALLBACK(sound_chosen_cb), NULL, | 1629 G_CALLBACK(sound_chosen_cb), NULL, |
1630 NULL, NULL, NULL, PURPLE_UI_REQUEST_HINT_PREFSMGR, | 1630 NULL, NULL, NULL, "preferences", |
1631 GINT_TO_POINTER(sound_row_sel)); | 1631 GINT_TO_POINTER(sound_row_sel)); |
1632 } | 1632 } |
1633 | 1633 |
1634 #ifdef USE_GSTREAMER | 1634 #ifdef USE_GSTREAMER |
1635 static gchar* prefs_sound_volume_format(GtkScale *scale, gdouble val) | 1635 static gchar* prefs_sound_volume_format(GtkScale *scale, gdouble val) |