Menu
▾
▴
[Gaim-commits] SF.net SVN: gaim: [16672] branches/soc-2006-file-loggers/src
|
From: <ro...@us...> - 2006-08-08 13:20:41
|
Revision: 16672 Author: roast Date: 2006-08-08 06:20:32 -0700 (Tue, 08 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16672&view=rev Log Message: ----------- minor cleanup in log.[ch] Modified Paths: -------------- branches/soc-2006-file-loggers/src/log.c branches/soc-2006-file-loggers/src/log.h Modified: branches/soc-2006-file-loggers/src/log.c =================================================================== --- branches/soc-2006-file-loggers/src/log.c 2006-08-08 01:12:58 UTC (rev 16671) +++ branches/soc-2006-file-loggers/src/log.c 2006-08-08 13:20:32 UTC (rev 16672) @@ -49,7 +49,7 @@ static void log_get_log_sets_common(GHashTable *sets); static gsize xml_logger_write(GaimLog *log, GaimMessageFlags type, - const char *from, time_t time, const char *message); + const char *from, time_t time, const char *message); static void xml_logger_finalize(GaimLog *log); static GList *xml_logger_list(GaimLogType type, const char *sn, GaimAccount *account); static GList *xml_logger_list_syslog(GaimAccount *account); @@ -57,7 +57,7 @@ static int xml_logger_total_size(GaimLogType type, const char *name, GaimAccount *account); static gsize html_logger_write(GaimLog *log, GaimMessageFlags type, - const char *from, time_t time, const char *message); + const char *from, time_t time, const char *message); static void html_logger_finalize(GaimLog *log); static GList *html_logger_list(GaimLogType type, const char *sn, GaimAccount *account); static GList *html_logger_list_syslog(GaimAccount *account); @@ -71,9 +71,8 @@ static void old_logger_get_log_sets(GaimLogSetCallback cb, GHashTable *sets); static void old_logger_finalize(GaimLog *log); -static gsize txt_logger_write(GaimLog *log, - GaimMessageFlags type, - const char *from, time_t time, const char *message); +static gsize txt_logger_write(GaimLog *log, GaimMessageFlags type, + const char *from, time_t time, const char *message); static void txt_logger_finalize(GaimLog *log); static GList *txt_logger_list(GaimLogType type, const char *sn, GaimAccount *account); static GList *txt_logger_list_syslog(GaimAccount *account); @@ -319,15 +318,15 @@ GaimLogLogger *gaim_log_logger_new(const char *id, const char *name, int functions, ...) { #if 0 - void(*create)(GaimLog *), - gsize(*write)(GaimLog *, GaimMessageFlags, const char *, time_t, const char *), - void(*finalize)(GaimLog *), - GList*(*list)(GaimLogType type, const char*, GaimAccount*), - char*(*read)(GaimLog*, GaimLogReadFlags*), - int(*size)(GaimLog*), - int(*total_size)(GaimLogType type, const char *name, GaimAccount *account), - GList*(*list_syslog)(GaimAccount *account), - void(*get_log_sets)(GaimLogSetCallback cb, GHashTable *sets)) + void(*create)(GaimLog *), + gsize(*write)(GaimLog *, GaimMessageFlags, const char *, time_t, const char *), + void(*finalize)(GaimLog *), + GList*(*list)(GaimLogType type, const char*, GaimAccount*), + char*(*read)(GaimLog*, GaimLogReadFlags*), + int(*size)(GaimLog*), + int(*total_size)(GaimLogType type, const char *name, GaimAccount *account), + GList*(*list_syslog)(GaimAccount *account), + void(*get_log_sets)(GaimLogSetCallback cb, GHashTable *sets)) { #endif GaimLogLogger *logger; @@ -570,53 +569,53 @@ gaim_prefs_add_string("/core/logging/format", "txt"); xml_logger = gaim_log_logger_new("xml", _("Unified Log Format (XML)"), 8, - NULL, - xml_logger_write, - xml_logger_finalize, - xml_logger_list, - xml_logger_read, - gaim_log_common_sizer, - xml_logger_total_size, - xml_logger_list_syslog); + NULL, + xml_logger_write, + xml_logger_finalize, + xml_logger_list, + xml_logger_read, + gaim_log_common_sizer, + xml_logger_total_size, + xml_logger_list_syslog); gaim_log_logger_add(xml_logger); html_logger = gaim_log_logger_new("html", _("HTML"), 8, - NULL, - html_logger_write, - html_logger_finalize, - html_logger_list, - html_logger_read, - gaim_log_common_sizer, - html_logger_total_size, - html_logger_list_syslog); + NULL, + html_logger_write, + html_logger_finalize, + html_logger_list, + html_logger_read, + gaim_log_common_sizer, + html_logger_total_size, + html_logger_list_syslog); gaim_log_logger_add(html_logger); txt_logger = gaim_log_logger_new("txt", _("Plain text"), 8, - NULL, - txt_logger_write, - txt_logger_finalize, - txt_logger_list, - txt_logger_read, - gaim_log_common_sizer, - txt_logger_total_size, - txt_logger_list_syslog); + NULL, + txt_logger_write, + txt_logger_finalize, + txt_logger_list, + txt_logger_read, + gaim_log_common_sizer, + txt_logger_total_size, + txt_logger_list_syslog); gaim_log_logger_add(txt_logger); old_logger = gaim_log_logger_new("old", _("Old Gaim"), 9, - NULL, - NULL, - old_logger_finalize, - old_logger_list, - old_logger_read, - old_logger_size, - old_logger_total_size, - NULL, - old_logger_get_log_sets); + NULL, + NULL, + old_logger_finalize, + old_logger_list, + old_logger_read, + old_logger_size, + old_logger_total_size, + NULL, + old_logger_get_log_sets); gaim_log_logger_add(old_logger); gaim_signal_register(handle, "log-timestamp", #if SIZEOF_TIME_T == 4 - gaim_marshal_POINTER__POINTER_INT, + gaim_marshal_POINTER__POINTER_INT, #elif SIZEOF_TIME_T == 8 gaim_marshal_POINTER__POINTER_INT64, #else @@ -628,18 +627,18 @@ #if SIZEOF_TIME_T == 4 gaim_value_new(GAIM_TYPE_INT)); #elif SIZEOF_TIME_T == 8 - gaim_value_new(GAIM_TYPE_INT64)); + gaim_value_new(GAIM_TYPE_INT64)); #else # error Unknown size of time_t #endif gaim_prefs_connect_callback(NULL, "/core/logging/format", - logger_pref_cb, NULL); + logger_pref_cb, NULL); gaim_prefs_trigger_callback("/core/logging/format"); logsize_users = g_hash_table_new_full((GHashFunc)_gaim_logsize_user_hash, - (GEqualFunc)_gaim_logsize_user_equal, - (GDestroyNotify)_gaim_logsize_user_free_key, NULL); + (GEqualFunc)_gaim_logsize_user_equal, + (GDestroyNotify)_gaim_logsize_user_free_key, NULL); } void @@ -658,8 +657,8 @@ struct tm tm; date = gaim_signal_emit_return_1(gaim_log_get_handle(), - "log-timestamp", - log, when); + "log-timestamp", + log, when); if (date != NULL) return date; @@ -691,7 +690,7 @@ gaim_build_dir (dir, S_IRUSR | S_IWUSR | S_IXUSR); tm = localtime(&log->time); - + { // build basename char * temp = g_strdup_printf("%s_%s", gaim_normalize(log->account, log->name), gaim_utf8_strftime("%Y-%m-%dT%H%M%S%z%Z", tm)); @@ -722,7 +721,7 @@ if (suffixchar == 'z' && g_file_test(path, G_FILE_TEST_EXISTS)) { /* we have a collision problem. not logging, and complain. */ gaim_conversation_write(log->conv, NULL, _("Logging of this conversation failed."), - GAIM_MESSAGE_ERROR, time(NULL)); + GAIM_MESSAGE_ERROR, time(NULL)); g_free(dir); g_free(path); g_free(extname); Modified: branches/soc-2006-file-loggers/src/log.h =================================================================== --- branches/soc-2006-file-loggers/src/log.h 2006-08-08 01:12:58 UTC (rev 16671) +++ branches/soc-2006-file-loggers/src/log.h 2006-08-08 13:20:32 UTC (rev 16672) @@ -94,26 +94,6 @@ GAIM_TOTAL_EVENTS } GaimEvents; -//typedef enum { -// GAIM_STATUS_ONLINE, /***< online */ -// GAIM_STATUS_OFFLINE, /***< offline */ -// GAIM_STATUS_AWAY, /***< away */ -// GAIM_STATUS_IDLE, /***< idle */ -// GAIM_STATUS_AVAILABLE, /***< available */ -// GAIM_STATUS_BUSY, /***< busy */ -// GAIM_STATUS_NOTATHOME, /***< notAtHome */ -// GAIM_STATUS_ONTHEPHONE, /***< onThePhone */ -// GAIM_STATUS_ONVACATION, /***< onVacation */ -// GAIM_STATUS_DONOTDISTURB, /***< doNotDisturb */ -// GAIM_STATUS_EXTENDEDAWAY, /***< extendedAway */ -// GAIM_STATUS_BERIGHTBACK, /***< beRightBack */ -// GAIM_STATUS_NOTAVAILABLE, /***< notAvailable */ -// GAIM_STATUS_NOTATHOME, /***< notAtHome */ -// GAIM_STATUS_NOTATMYDESK, /***< notAtMyDesk */ -// GAIM_STATUS_NOTINTHEOFFICE, /***< notInTheOffice */ -// GAIM_STATUS_STEPPEDOUT, /***< steppedOut */ -//} GaimStatusFlag; - #include "account.h" #include "conversation.h" This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
