comparison: pidgin/gtkconv.c
pidgin/gtkconv.c
- branch
- cpw.qulogic.gtk3
- changeset 32362
- 8175436b817f
- parent 32361
- b70251c4e068
- child 32365
- 0c722056e496
equal
deleted
inserted
replaced
| 32361:b70251c4e068 | 32362:8175436b817f |
|---|---|
| 1225 | 1225 |
| 1226 #ifdef USE_VV | 1226 #ifdef USE_VV |
| 1227 static void | 1227 static void |
| 1228 #if GTK_CHECK_VERSION(2,6,0) | 1228 #if GTK_CHECK_VERSION(2,6,0) |
| 1229 menu_initiate_media_call_cb(GtkAction *action, gpointer data) | 1229 menu_initiate_media_call_cb(GtkAction *action, gpointer data) |
| 1230 #else | |
| 1231 menu_initiate_media_call_cb(gpointer data, guint action, GtkWidget *widget) | |
| 1232 #endif | |
| 1233 { | 1230 { |
| 1234 PidginWindow *win = (PidginWindow *)data; | 1231 PidginWindow *win = (PidginWindow *)data; |
| 1235 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); | 1232 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); |
| 1236 PurpleAccount *account = purple_conversation_get_account(conv); | 1233 PurpleAccount *account = purple_conversation_get_account(conv); |
| 1237 | 1234 |
| 1238 /* FIXME: action is not an int... */ | 1235 purple_prpl_initiate_media(account, |
| 1236 purple_conversation_get_name(conv), | |
| 1237 action == win->audio_call ? PURPLE_MEDIA_AUDIO : | |
| 1238 action == win->video_call ? PURPLE_MEDIA_VIDEO : | |
| 1239 action == win->audio_video_call ? PURPLE_MEDIA_AUDIO | | |
| 1240 PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE); | |
| 1241 } | |
| 1242 #else | |
| 1243 menu_initiate_media_call_cb(gpointer data, guint action, GtkWidget *widget) | |
| 1244 { | |
| 1245 PidginWindow *win = (PidginWindow *)data; | |
| 1246 PurpleConversation *conv = pidgin_conv_window_get_active_conversation(win); | |
| 1247 PurpleAccount *account = purple_conversation_get_account(conv); | |
| 1248 | |
| 1239 purple_prpl_initiate_media(account, | 1249 purple_prpl_initiate_media(account, |
| 1240 purple_conversation_get_name(conv), | 1250 purple_conversation_get_name(conv), |
| 1241 action == 0 ? PURPLE_MEDIA_AUDIO : | 1251 action == 0 ? PURPLE_MEDIA_AUDIO : |
| 1242 action == 1 ? PURPLE_MEDIA_VIDEO : | 1252 action == 1 ? PURPLE_MEDIA_VIDEO : |
| 1243 action == 2 ? PURPLE_MEDIA_AUDIO | | 1253 action == 2 ? PURPLE_MEDIA_AUDIO | |
| 1244 PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE); | 1254 PURPLE_MEDIA_VIDEO : PURPLE_MEDIA_NONE); |
| 1245 } | 1255 } |
| 1256 #endif | |
| 1246 #endif | 1257 #endif |
| 1247 | 1258 |
| 1248 static void | 1259 static void |
| 1249 #if GTK_CHECK_VERSION(2,6,0) | 1260 #if GTK_CHECK_VERSION(2,6,0) |
| 1250 menu_send_file_cb(GtkAction *action, gpointer data) | 1261 menu_send_file_cb(GtkAction *action, gpointer data) |
