Mercurial > pidgin.yaz
comparison pidgin/gtkprefs.c @ 21560:665e04562de0
This merge has the effect of reverting the hinting code from trunk.
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 17 Nov 2007 00:12:30 +0000 |
parents | 6de09629f091 fcb848b2d669 |
children | 2a2496044eef c9946b9965c9 98604b4bfa3b |
comparison
equal
deleted
inserted
replaced
21544:9b4d1af17ced | 21560:665e04562de0 |
---|---|
639 } | 639 } |
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(NULL, _("Install Theme"), NULL, FALSE, (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, NULL) ; |
645 (GCallback)request_theme_file_name_cb, NULL, NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR, NULL) ; | |
646 } | 645 } |
647 | 646 |
648 static void | 647 static void |
649 remove_theme_button_clicked_cb(GtkWidget *button, GtkTreeView *tv) | 648 remove_theme_button_clicked_cb(GtkWidget *button, GtkTreeView *tv) |
650 { | 649 { |
1720 g_free(pref); | 1719 g_free(pref); |
1721 | 1720 |
1722 if (*filename == '\0') | 1721 if (*filename == '\0') |
1723 filename = NULL; | 1722 filename = NULL; |
1724 | 1723 |
1725 purple_request_file_with_hint(prefs, _("Sound Selection"), filename, FALSE, | 1724 purple_request_file(prefs, _("Sound Selection"), filename, FALSE, |
1726 G_CALLBACK(sound_chosen_cb), NULL, | 1725 G_CALLBACK(sound_chosen_cb), NULL, |
1727 NULL, NULL, NULL, PURPLE_REQUEST_UI_HINT_PREFSMGR, | 1726 NULL, NULL, NULL, |
1728 GINT_TO_POINTER(sound_row_sel)); | 1727 GINT_TO_POINTER(sound_row_sel)); |
1729 } | 1728 } |
1730 | 1729 |
1731 #ifdef USE_GSTREAMER | 1730 #ifdef USE_GSTREAMER |
1732 static gchar* prefs_sound_volume_format(GtkScale *scale, gdouble val) | 1731 static gchar* prefs_sound_volume_format(GtkScale *scale, gdouble val) |