comparison finch/gntconv.c @ 28629:f15b14df260d

Return the proper enum values from command callbacks.
author Sadrul Habib Chowdhury <imadil@gmail.com>
date Tue, 15 Sep 2009 06:42:10 +0000
parents 574fd92ff3e5
children 71dc3b5edbe7
comparison
equal deleted inserted replaced
28628:574fd92ff3e5 28629:f15b14df260d
1205 1205
1206 tmp = g_string_free(str, FALSE); 1206 tmp = g_string_free(str, FALSE);
1207 } else { 1207 } else {
1208 purple_conversation_write(conv, NULL, _("Supported debug options are: plugins version"), 1208 purple_conversation_write(conv, NULL, _("Supported debug options are: plugins version"),
1209 PURPLE_MESSAGE_NO_LOG|PURPLE_MESSAGE_ERROR, time(NULL)); 1209 PURPLE_MESSAGE_NO_LOG|PURPLE_MESSAGE_ERROR, time(NULL));
1210 return PURPLE_CMD_STATUS_OK; 1210 return PURPLE_CMD_RET_OK;
1211 } 1211 }
1212 1212
1213 markup = g_markup_escape_text(tmp, -1); 1213 markup = g_markup_escape_text(tmp, -1);
1214 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM) 1214 if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_IM)
1215 purple_conv_im_send(PURPLE_CONV_IM(conv), markup); 1215 purple_conv_im_send(PURPLE_CONV_IM(conv), markup);
1216 else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) 1216 else if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT)
1217 purple_conv_chat_send(PURPLE_CONV_CHAT(conv), markup); 1217 purple_conv_chat_send(PURPLE_CONV_CHAT(conv), markup);
1218 1218
1219 g_free(tmp); 1219 g_free(tmp);
1220 g_free(markup); 1220 g_free(markup);
1221 return PURPLE_CMD_STATUS_OK; 1221 return PURPLE_CMD_RET_OK;
1222 } 1222 }
1223 1223
1224 /* Xerox */ 1224 /* Xerox */
1225 static PurpleCmdRet 1225 static PurpleCmdRet
1226 clear_command_cb(PurpleConversation *conv, 1226 clear_command_cb(PurpleConversation *conv,
1227 const char *cmd, char **args, char **error, void *data) 1227 const char *cmd, char **args, char **error, void *data)
1228 { 1228 {
1229 FinchConv *ggconv = FINCH_GET_DATA(conv); 1229 FinchConv *ggconv = FINCH_GET_DATA(conv);
1230 gnt_text_view_clear(GNT_TEXT_VIEW(ggconv->tv)); 1230 gnt_text_view_clear(GNT_TEXT_VIEW(ggconv->tv));
1231 purple_conversation_clear_message_history(conv); 1231 purple_conversation_clear_message_history(conv);
1232 return PURPLE_CMD_STATUS_OK; 1232 return PURPLE_CMD_RET_OK;
1233 } 1233 }
1234 1234
1235 /* Xerox */ 1235 /* Xerox */
1236 static PurpleCmdRet 1236 static PurpleCmdRet
1237 help_command_cb(PurpleConversation *conv, 1237 help_command_cb(PurpleConversation *conv,
1267 } 1267 }
1268 1268
1269 purple_conversation_write(conv, NULL, s->str, PURPLE_MESSAGE_NO_LOG, time(NULL)); 1269 purple_conversation_write(conv, NULL, s->str, PURPLE_MESSAGE_NO_LOG, time(NULL));
1270 g_string_free(s, TRUE); 1270 g_string_free(s, TRUE);
1271 1271
1272 return PURPLE_CMD_STATUS_OK; 1272 return PURPLE_CMD_RET_OK;
1273 } 1273 }
1274 1274
1275 static PurpleCmdRet 1275 static PurpleCmdRet
1276 cmd_show_window(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data) 1276 cmd_show_window(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
1277 { 1277 {
1278 void (*callback)(void) = data; 1278 void (*callback)(void) = data;
1279 callback(); 1279 callback();
1280 return PURPLE_CMD_STATUS_OK; 1280 return PURPLE_CMD_RET_OK;
1281 } 1281 }
1282 1282
1283 #if GLIB_CHECK_VERSION(2,6,0) 1283 #if GLIB_CHECK_VERSION(2,6,0)
1284 static PurpleCmdRet 1284 static PurpleCmdRet
1285 cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data) 1285 cmd_message_color(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
1298 else if (strcmp(args[0], "timestamp") == 0) 1298 else if (strcmp(args[0], "timestamp") == 0)
1299 msgclass = &color_timestamp; 1299 msgclass = &color_timestamp;
1300 else { 1300 else {
1301 if (error) 1301 if (error)
1302 *error = g_strdup_printf(_("%s is not a valid message class. See '/help msgcolor' for valid message classes."), args[0]); 1302 *error = g_strdup_printf(_("%s is not a valid message class. See '/help msgcolor' for valid message classes."), args[0]);
1303 return PURPLE_CMD_STATUS_FAILED; 1303 return PURPLE_CMD_RET_FAILED;
1304 } 1304 }
1305 1305
1306 fg = gnt_colors_get_color(args[1]); 1306 fg = gnt_colors_get_color(args[1]);
1307 if (fg == -EINVAL) { 1307 if (fg == -EINVAL) {
1308 if (error) 1308 if (error)
1309 *error = g_strdup_printf(_("%s is not a valid color. See '/help msgcolor' for valid colors."), args[1]); 1309 *error = g_strdup_printf(_("%s is not a valid color. See '/help msgcolor' for valid colors."), args[1]);
1310 return PURPLE_CMD_STATUS_FAILED; 1310 return PURPLE_CMD_RET_FAILED;
1311 } 1311 }
1312 1312
1313 bg = gnt_colors_get_color(args[2]); 1313 bg = gnt_colors_get_color(args[2]);
1314 if (bg == -EINVAL) { 1314 if (bg == -EINVAL) {
1315 if (error) 1315 if (error)
1316 *error = g_strdup_printf(_("%s is not a valid color. See '/help msgcolor' for valid colors."), args[2]); 1316 *error = g_strdup_printf(_("%s is not a valid color. See '/help msgcolor' for valid colors."), args[2]);
1317 return PURPLE_CMD_STATUS_FAILED; 1317 return PURPLE_CMD_RET_FAILED;
1318 } 1318 }
1319 1319
1320 init_pair(*msgclass, fg, bg); 1320 init_pair(*msgclass, fg, bg);
1321 1321
1322 return PURPLE_CMD_STATUS_OK; 1322 return PURPLE_CMD_RET_OK;
1323 } 1323 }
1324 #endif 1324 #endif
1325 1325
1326 static PurpleCmdRet 1326 static PurpleCmdRet
1327 users_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data) 1327 users_command_cb(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
1328 { 1328 {
1329 FinchConv *fc = FINCH_GET_DATA(conv); 1329 FinchConv *fc = FINCH_GET_DATA(conv);
1330 FinchConvChat *ch; 1330 FinchConvChat *ch;
1331 if (!fc) 1331 if (!fc)
1332 return PURPLE_CMD_STATUS_FAILED; 1332 return PURPLE_CMD_RET_FAILED;
1333 1333
1334 ch = fc->u.chat; 1334 ch = fc->u.chat;
1335 gnt_widget_set_visible(ch->userlist, 1335 gnt_widget_set_visible(ch->userlist,
1336 (GNT_WIDGET_IS_FLAG_SET(ch->userlist, GNT_WIDGET_INVISIBLE))); 1336 (GNT_WIDGET_IS_FLAG_SET(ch->userlist, GNT_WIDGET_INVISIBLE)));
1337 gnt_box_readjust(GNT_BOX(fc->window)); 1337 gnt_box_readjust(GNT_BOX(fc->window));
1338 gnt_box_give_focus_to_child(GNT_BOX(fc->window), fc->entry); 1338 gnt_box_give_focus_to_child(GNT_BOX(fc->window), fc->entry);
1339 purple_prefs_set_bool(PREF_USERLIST, !(GNT_WIDGET_IS_FLAG_SET(ch->userlist, GNT_WIDGET_INVISIBLE))); 1339 purple_prefs_set_bool(PREF_USERLIST, !(GNT_WIDGET_IS_FLAG_SET(ch->userlist, GNT_WIDGET_INVISIBLE)));
1340 return PURPLE_CMD_STATUS_OK; 1340 return PURPLE_CMD_RET_OK;
1341 } 1341 }
1342 1342
1343 void finch_conversation_init() 1343 void finch_conversation_init()
1344 { 1344 {
1345 color_message_send = gnt_style_get_color(NULL, "color-message-sent"); 1345 color_message_send = gnt_style_get_color(NULL, "color-message-sent");