comparison: pidgin/gtkprefs.c
pidgin/gtkprefs.c
- branch
- soc.2008.vv
- changeset 26112
- 3c2d389fcad1
- parent 23721
- 15285d082f6c
- child 26115
- 5f0500efc781
equal
deleted
inserted
replaced
| 26111:d25772351a75 | 26112:3c2d389fcad1 |
|---|---|
| 2110 GtkWidget *dd = NULL; | 2110 GtkWidget *dd = NULL; |
| 2111 GtkWidget *preview_button = NULL; | 2111 GtkWidget *preview_button = NULL; |
| 2112 const char *plugin = value; | 2112 const char *plugin = value; |
| 2113 const char *device = purple_prefs_get_string("/purple/media/video/device"); | 2113 const char *device = purple_prefs_get_string("/purple/media/video/device"); |
| 2114 GstElement *video = purple_media_get_element(plugin); | 2114 GstElement *video = purple_media_get_element(plugin); |
| 2115 GList *video_devices = purple_media_get_devices(video); | 2115 GList *video_items = NULL; |
| 2116 GList *video_items = get_device_items(video, video_devices); | |
| 2117 GList *list; | 2116 GList *list; |
| 2118 g_list_free(video_devices); | 2117 |
| 2118 if (video != NULL) { | |
| 2119 GList *video_devices = purple_media_get_devices(video); | |
| 2120 video_items = get_device_items(video, video_devices); | |
| 2121 g_list_free(video_devices); | |
| 2122 } | |
| 2119 | 2123 |
| 2120 if (video_items == NULL) { | 2124 if (video_items == NULL) { |
| 2121 video_items = g_list_prepend(video_items, g_strdup("")); | 2125 video_items = g_list_prepend(video_items, g_strdup("")); |
| 2122 video_items = g_list_prepend(video_items, g_strdup("Default")); | 2126 video_items = g_list_prepend(video_items, g_strdup("Default")); |
| 2123 } | 2127 } |
| 2163 const char *device = purple_prefs_get_string("/purple/media/video/device"); | 2167 const char *device = purple_prefs_get_string("/purple/media/video/device"); |
| 2164 | 2168 |
| 2165 GstElement *video = purple_media_get_element(plugin); | 2169 GstElement *video = purple_media_get_element(plugin); |
| 2166 GstElement *audio = purple_media_get_element("alsasrc"); | 2170 GstElement *audio = purple_media_get_element("alsasrc"); |
| 2167 | 2171 |
| 2168 GList *video_devices = purple_media_get_devices(video); | 2172 GList *video_items = NULL; |
| 2169 GList *audio_devices = purple_media_get_devices(audio); | 2173 GList *audio_items = NULL; |
| 2170 | 2174 |
| 2171 GList *video_items = get_device_items(video, video_devices); | 2175 if (video != NULL) { |
| 2172 GList *audio_items = get_device_items(audio, audio_devices); | 2176 GList *video_devices = purple_media_get_devices(video); |
| 2173 | 2177 video_items = get_device_items(video, video_devices); |
| 2174 g_list_free(video_devices); | 2178 g_list_free(video_devices); |
| 2175 g_list_free(audio_devices); | 2179 } |
| 2180 | |
| 2181 if (audio != NULL) { | |
| 2182 GList *audio_devices = purple_media_get_devices(audio); | |
| 2183 audio_items = get_device_items(audio, audio_devices); | |
| 2184 g_list_free(audio_devices); | |
| 2185 } | |
| 2176 | 2186 |
| 2177 if (video_items == NULL) { | 2187 if (video_items == NULL) { |
| 2178 video_items = g_list_prepend(video_items, ""); | 2188 video_items = g_list_prepend(video_items, ""); |
| 2179 video_items = g_list_prepend(video_items, "Default"); | 2189 video_items = g_list_prepend(video_items, "Default"); |
| 2180 } | 2190 } |
