comparison libpurple/request.c @ 20598:285bb637a2b7

Updated hinting to be less invasive
author Gabriel Schulhof <nix@go-nix.ca>
date Sat, 22 Sep 2007 16:19:34 +0000
parents 591267f6f1d5
children 44cb8acdb68c
comparison
equal deleted inserted replaced
20597:591267f6f1d5 20598:285bb637a2b7
1138 const char *secondary, const char *default_value, 1138 const char *secondary, const char *default_value,
1139 gboolean multiline, gboolean masked, gchar *hint, 1139 gboolean multiline, gboolean masked, gchar *hint,
1140 const char *ok_text, GCallback ok_cb, 1140 const char *ok_text, GCallback ok_cb,
1141 const char *cancel_text, GCallback cancel_cb, 1141 const char *cancel_text, GCallback cancel_cb,
1142 PurpleAccount *account, const char *who, PurpleConversation *conv, 1142 PurpleAccount *account, const char *who, PurpleConversation *conv,
1143 void *user_data)
1144 {
1145 return purple_request_input_with_hint(
1146 handle, title, primary, secondary, default_value, multiline, masked, hint, ok_text, ok_cb,
1147 cancel_text, cancel_cb, account, who, conv, "blist", user_data);
1148 }
1149
1150 void *
1151 purple_request_input_with_hint(void *handle, const char *title, const char *primary,
1152 const char *secondary, const char *default_value,
1153 gboolean multiline, gboolean masked, gchar *hint,
1154 const char *ok_text, GCallback ok_cb,
1155 const char *cancel_text, GCallback cancel_cb,
1156 PurpleAccount *account, const char *who, PurpleConversation *conv,
1143 const char *ui_hint, void *user_data) 1157 const char *ui_hint, void *user_data)
1144 { 1158 {
1145 PurpleRequestUiOps *ops; 1159 PurpleRequestUiOps *ops;
1146 1160
1147 g_return_val_if_fail(ok_text != NULL, NULL); 1161 g_return_val_if_fail(ok_text != NULL, NULL);
1175 purple_request_choice(void *handle, const char *title, const char *primary, 1189 purple_request_choice(void *handle, const char *title, const char *primary,
1176 const char *secondary, int default_value, 1190 const char *secondary, int default_value,
1177 const char *ok_text, GCallback ok_cb, 1191 const char *ok_text, GCallback ok_cb,
1178 const char *cancel_text, GCallback cancel_cb, 1192 const char *cancel_text, GCallback cancel_cb,
1179 PurpleAccount *account, const char *who, PurpleConversation *conv, 1193 PurpleAccount *account, const char *who, PurpleConversation *conv,
1180 const char *ui_hint, void *user_data, ...) 1194 void *user_data, ...)
1181 { 1195 {
1182 void *ui_handle; 1196 void *ui_handle;
1183 va_list args; 1197 va_list args;
1184 1198
1185 g_return_val_if_fail(ok_text != NULL, NULL); 1199 g_return_val_if_fail(ok_text != NULL, NULL);
1186 g_return_val_if_fail(ok_cb != NULL, NULL); 1200 g_return_val_if_fail(ok_cb != NULL, NULL);
1187 1201
1188 va_start(args, user_data); 1202 va_start(args, user_data);
1189 ui_handle = purple_request_choice_varg(handle, title, primary, secondary, 1203 ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary,
1204 default_value, ok_text, ok_cb,
1205 cancel_text, cancel_cb,
1206 account, who, conv, "blist", user_data, args);
1207 va_end(args);
1208
1209 return ui_handle;
1210 }
1211
1212 void *
1213 purple_request_choice_with_hint(void *handle, const char *title, const char *primary,
1214 const char *secondary, int default_value,
1215 const char *ok_text, GCallback ok_cb,
1216 const char *cancel_text, GCallback cancel_cb,
1217 PurpleAccount *account, const char *who, PurpleConversation *conv,
1218 const char *ui_hint, void *user_data, ...)
1219 {
1220 void *ui_handle;
1221 va_list args;
1222
1223 g_return_val_if_fail(ok_text != NULL, NULL);
1224 g_return_val_if_fail(ok_cb != NULL, NULL);
1225
1226 va_start(args, user_data);
1227 ui_handle = purple_request_choice_varg_with_hint(handle, title, primary, secondary,
1190 default_value, ok_text, ok_cb, 1228 default_value, ok_text, ok_cb,
1191 cancel_text, cancel_cb, 1229 cancel_text, cancel_cb,
1192 account, who, conv, ui_hint, user_data, args); 1230 account, who, conv, ui_hint, user_data, args);
1193 va_end(args); 1231 va_end(args);
1194 1232
1195 return ui_handle; 1233 return ui_handle;
1196 } 1234 }
1197 1235
1198 void * 1236 void *
1199 purple_request_choice_varg(void *handle, const char *title, 1237 purple_request_choice_varg(void *handle, const char *title,
1238 const char *primary, const char *secondary,
1239 int default_value,
1240 const char *ok_text, GCallback ok_cb,
1241 const char *cancel_text, GCallback cancel_cb,
1242 PurpleAccount *account, const char *who, PurpleConversation *conv,
1243 const char *ui_hint, void *user_data, va_list choices)
1244 {
1245 return purple_choice_varg_with_hint(
1246 handle, title, primary, secondary, default_value, ok_text, ok_cb,
1247 cancel_text, cancel_cb, account, who, conv, "blist", user_data, choices);
1248 }
1249
1250 void *
1251 purple_request_choice_varg_with_hint(void *handle, const char *title,
1200 const char *primary, const char *secondary, 1252 const char *primary, const char *secondary,
1201 int default_value, 1253 int default_value,
1202 const char *ok_text, GCallback ok_cb, 1254 const char *ok_text, GCallback ok_cb,
1203 const char *cancel_text, GCallback cancel_cb, 1255 const char *cancel_text, GCallback cancel_cb,
1204 PurpleAccount *account, const char *who, PurpleConversation *conv, 1256 PurpleAccount *account, const char *who, PurpleConversation *conv,
1234 1286
1235 void * 1287 void *
1236 purple_request_action(void *handle, const char *title, const char *primary, 1288 purple_request_action(void *handle, const char *title, const char *primary,
1237 const char *secondary, int default_action, 1289 const char *secondary, int default_action,
1238 PurpleAccount *account, const char *who, PurpleConversation *conv, 1290 PurpleAccount *account, const char *who, PurpleConversation *conv,
1239 const char *ui_hint, void *user_data, size_t action_count, ...) 1291 void *user_data, size_t action_count, ...)
1240 { 1292 {
1241 void *ui_handle; 1293 void *ui_handle;
1242 va_list args; 1294 va_list args;
1243 1295
1244 g_return_val_if_fail(action_count > 0, NULL); 1296 g_return_val_if_fail(action_count > 0, NULL);
1245 1297
1246 va_start(args, action_count); 1298 va_start(args, action_count);
1247 ui_handle = purple_request_action_varg(handle, title, primary, secondary, 1299 ui_handle = purple_request_action_with_hint_varg(handle, title, primary, secondary,
1300 default_action, account, who, conv,
1301 "blist", user_data, action_count, args);
1302 va_end(args);
1303
1304 return ui_handle;
1305 }
1306
1307 void *
1308 purple_request_action_with_hint(void *handle, const char *title, const char *primary,
1309 const char *secondary, int default_action,
1310 PurpleAccount *account, const char *who, PurpleConversation *conv,
1311 const char *ui_hint, void *user_data, size_t action_count, ...)
1312 {
1313 void *ui_handle;
1314 va_list args;
1315
1316 g_return_val_if_fail(action_count > 0, NULL);
1317
1318 va_start(args, action_count);
1319 ui_handle = purple_request_action_with_hint_varg(handle, title, primary, secondary,
1248 default_action, account, who, conv, 1320 default_action, account, who, conv,
1249 ui_hint, user_data, action_count, args); 1321 ui_hint, user_data, action_count, args);
1250 va_end(args); 1322 va_end(args);
1251 1323
1252 return ui_handle; 1324 return ui_handle;
1253 } 1325 }
1254 1326
1255 void * 1327 void *
1256 purple_request_action_varg(void *handle, const char *title, 1328 purple_request_action_varg(void *handle, const char *title,
1329 const char *primary, const char *secondary,
1330 int default_action,
1331 PurpleAccount *account, const char *who, PurpleConversation *conv,
1332 void *user_data, size_t action_count, va_list actions)
1333 {
1334 return purple_request_action_with_hint_varg(
1335 handle, title, primary, secondary, default_action, account, who, conv,
1336 "blist", user_data, action_count, actions);
1337 }
1338
1339 void *
1340 purple_request_action_with_hint_varg(void *handle, const char *title,
1257 const char *primary, const char *secondary, 1341 const char *primary, const char *secondary,
1258 int default_action, 1342 int default_action,
1259 PurpleAccount *account, const char *who, PurpleConversation *conv, 1343 PurpleAccount *account, const char *who, PurpleConversation *conv,
1260 const char *ui_hint, void *user_data, size_t action_count, va_list actions) 1344 const char *ui_hint, void *user_data, size_t action_count, va_list actions)
1261 { 1345 {
1283 return NULL; 1367 return NULL;
1284 } 1368 }
1285 1369
1286 void * 1370 void *
1287 purple_request_fields(void *handle, const char *title, const char *primary, 1371 purple_request_fields(void *handle, const char *title, const char *primary,
1372 const char *secondary, PurpleRequestFields *fields,
1373 const char *ok_text, GCallback ok_cb,
1374 const char *cancel_text, GCallback cancel_cb,
1375 PurpleAccount *account, const char *who, PurpleConversation *conv,
1376 const char *ui_hint, void *user_data)
1377 {
1378 return purple_request_fields_with_hint(
1379 handle, title, primary, secondary, fields, ok_text, ok_cb,
1380 cancel_text, cancel_cb, account, who, conv, "blist", user_data);
1381 }
1382
1383 void *
1384 purple_request_fields_with_hint(void *handle, const char *title, const char *primary,
1288 const char *secondary, PurpleRequestFields *fields, 1385 const char *secondary, PurpleRequestFields *fields,
1289 const char *ok_text, GCallback ok_cb, 1386 const char *ok_text, GCallback ok_cb,
1290 const char *cancel_text, GCallback cancel_cb, 1387 const char *cancel_text, GCallback cancel_cb,
1291 PurpleAccount *account, const char *who, PurpleConversation *conv, 1388 PurpleAccount *account, const char *who, PurpleConversation *conv,
1292 const char *ui_hint, void *user_data) 1389 const char *ui_hint, void *user_data)
1318 1415
1319 return NULL; 1416 return NULL;
1320 } 1417 }
1321 1418
1322 void * 1419 void *
1323 purple_request_file(void *handle, const char *title, const char *filename, 1420 purple_request_file_with_hint(void *handle, const char *title, const char *filename,
1421 gboolean savedialog,
1422 GCallback ok_cb, GCallback cancel_cb,
1423 PurpleAccount *account, const char *who, PurpleConversation *conv,
1424 void *user_data)
1425 {
1426 return purple_request_file_with_hint(
1427 handle, title, filename, savedialog ok_cb, cancel_cb, account, who, conv, "blist", user_data);
1428 }
1429
1430 void *
1431 purple_request_file_with_hint(void *handle, const char *title, const char *filename,
1324 gboolean savedialog, 1432 gboolean savedialog,
1325 GCallback ok_cb, GCallback cancel_cb, 1433 GCallback ok_cb, GCallback cancel_cb,
1326 PurpleAccount *account, const char *who, PurpleConversation *conv, 1434 PurpleAccount *account, const char *who, PurpleConversation *conv,
1327 const char *ui_hint, void *user_data) 1435 const char *ui_hint, void *user_data)
1328 { 1436 {
1346 return NULL; 1454 return NULL;
1347 } 1455 }
1348 1456
1349 void * 1457 void *
1350 purple_request_folder(void *handle, const char *title, const char *dirname, 1458 purple_request_folder(void *handle, const char *title, const char *dirname,
1459 GCallback ok_cb, GCallback cancel_cb,
1460 PurpleAccount *account, const char *who, PurpleConversation *conv,
1461 void *user_data)
1462 {
1463 return purple_request_folder_with_hint(
1464 handle, title, dirname, ok_cb, cancel_cb, account, who, conv, "blist", user_data);
1465 }
1466
1467 void *
1468 purple_request_folder_with_hint(void *handle, const char *title, const char *dirname,
1351 GCallback ok_cb, GCallback cancel_cb, 1469 GCallback ok_cb, GCallback cancel_cb,
1352 PurpleAccount *account, const char *who, PurpleConversation *conv, 1470 PurpleAccount *account, const char *who, PurpleConversation *conv,
1353 const char *ui_hint, void *user_data) 1471 const char *ui_hint, void *user_data)
1354 { 1472 {
1355 PurpleRequestUiOps *ops; 1473 PurpleRequestUiOps *ops;