Mercurial > pidgin
comparison pidgin/gtkprefs.c @ 23804:cbe97caec684
Use USE_VV instead of USE_FARSIGHT.
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Wed, 28 May 2008 21:00:40 +0000 |
parents | 4b9b265a8100 |
children | 10f5a529d2a6 |
comparison
equal
deleted
inserted
replaced
23803:3f835618356a | 23804:cbe97caec684 |
---|---|
1908 g_object_unref(sg); | 1908 g_object_unref(sg); |
1909 | 1909 |
1910 return ret; | 1910 return ret; |
1911 } | 1911 } |
1912 | 1912 |
1913 #ifdef USE_FARSIGHT | 1913 #ifdef USE_VV |
1914 | 1914 |
1915 /* get a GList of pairs name / device */ | 1915 /* get a GList of pairs name / device */ |
1916 static GList * | 1916 static GList * |
1917 get_device_items(const GstElement *element, | 1917 get_device_items(const GstElement *element, |
1918 const GList *devices) | 1918 const GList *devices) |
2131 gtk_widget_show_all(ret); | 2131 gtk_widget_show_all(ret); |
2132 | 2132 |
2133 return ret; | 2133 return ret; |
2134 } | 2134 } |
2135 | 2135 |
2136 #endif | 2136 #endif /* USE_VV */ |
2137 | 2137 |
2138 static void | 2138 static void |
2139 set_idle_away(PurpleSavedStatus *status) | 2139 set_idle_away(PurpleSavedStatus *status) |
2140 { | 2140 { |
2141 purple_prefs_set_int("/purple/savedstatus/idleaway", purple_savedstatus_get_creation_time(status)); | 2141 purple_prefs_set_int("/purple/savedstatus/idleaway", purple_savedstatus_get_creation_time(status)); |
2258 prefs_notebook_add_page(_("Interface"), interface_page(), notebook_page++); | 2258 prefs_notebook_add_page(_("Interface"), interface_page(), notebook_page++); |
2259 prefs_notebook_add_page(_("Conversations"), conv_page(), notebook_page++); | 2259 prefs_notebook_add_page(_("Conversations"), conv_page(), notebook_page++); |
2260 prefs_notebook_add_page(_("Smiley Themes"), theme_page(), notebook_page++); | 2260 prefs_notebook_add_page(_("Smiley Themes"), theme_page(), notebook_page++); |
2261 prefs_notebook_add_page(_("Sounds"), sound_page(), notebook_page++); | 2261 prefs_notebook_add_page(_("Sounds"), sound_page(), notebook_page++); |
2262 | 2262 |
2263 #ifdef USE_FARSIGHT | 2263 #ifdef USE_VV |
2264 prefs_notebook_add_page(_("Media"), media_page(), notebook_page++); | 2264 prefs_notebook_add_page(_("Media"), media_page(), notebook_page++); |
2265 #endif | 2265 #endif |
2266 prefs_notebook_add_page(_("Network"), network_page(), notebook_page++); | 2266 prefs_notebook_add_page(_("Network"), network_page(), notebook_page++); |
2267 #ifndef _WIN32 | 2267 #ifndef _WIN32 |
2268 /* We use the registered default browser in windows */ | 2268 /* We use the registered default browser in windows */ |
2386 | 2386 |
2387 /* Smiley Callbacks */ | 2387 /* Smiley Callbacks */ |
2388 purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme", | 2388 purple_prefs_connect_callback(prefs, PIDGIN_PREFS_ROOT "/smileys/theme", |
2389 smiley_theme_pref_cb, NULL); | 2389 smiley_theme_pref_cb, NULL); |
2390 | 2390 |
2391 #ifdef USE_FARSIGHT | 2391 #ifdef USE_VV |
2392 purple_prefs_add_none("/purple/media"); | 2392 purple_prefs_add_none("/purple/media"); |
2393 purple_prefs_add_none("/purple/media/video"); | 2393 purple_prefs_add_none("/purple/media/video"); |
2394 purple_prefs_add_string("/purple/media/video/plugin", "gconfvideosrc"); | 2394 purple_prefs_add_string("/purple/media/video/plugin", "gconfvideosrc"); |
2395 purple_prefs_add_string("/purple/media/video/device", ""); | 2395 purple_prefs_add_string("/purple/media/video/device", ""); |
2396 purple_prefs_add_none("/purple/media/audio"); | 2396 purple_prefs_add_none("/purple/media/audio"); |
2397 purple_prefs_add_string("/purple/media/audio/device", ""); | 2397 purple_prefs_add_string("/purple/media/audio/device", ""); |
2398 #endif /* USE_FARSIGHT */ | 2398 #endif /* USE_VV */ |
2399 | 2399 |
2400 pidgin_prefs_update_old(); | 2400 pidgin_prefs_update_old(); |
2401 } | 2401 } |
2402 | 2402 |
2403 void pidgin_prefs_update_old() | 2403 void pidgin_prefs_update_old() |