im.pidgin.pidgin: 438e92eedb4b96a66783420a77668417f9b293f9
rlaager at pidgin.im
rlaager at pidgin.im
Sat Jan 5 13:10:39 EST 2008
-----------------------------------------------------------------
Revision: 438e92eedb4b96a66783420a77668417f9b293f9
Ancestor: 82b414ee3bf78684f9abfe73e3b25c9885de1571
Author: rlaager at pidgin.im
Date: 2008-01-03T04:57:40
Branch: im.pidgin.pidgin
Modified files:
config.h.mingw configure.ac finch/finch.c finch/gntaccount.c
finch/gntblist.c finch/gntcertmgr.c finch/gntconv.c
finch/gntft.c finch/gntft.h finch/gntidle.c
finch/gntnotify.c finch/gntplugin.c finch/gntplugin.h
finch/gntprefs.c finch/gntsound.c finch/libgnt/gnt.h
finch/libgnt/gntbindable.c finch/libgnt/gntcolors.c
finch/libgnt/gntentry.c finch/libgnt/gntmain.c
finch/libgnt/gnttextview.c finch/libgnt/gntwm.c
finch/libgnt/gntwm.h finch/plugins/gntgf.c
libpurple/account.c libpurple/blist.c libpurple/dnsquery.c
libpurple/example/nullclient.c libpurple/idle.c
libpurple/plugins/ciphertest.c
libpurple/plugins/log_reader.c
libpurple/plugins/ssl/ssl-nss.c libpurple/plugins/tcl/tcl.c
libpurple/protocols/bonjour/bonjour.c
libpurple/protocols/msnp9/slpcall.c
libpurple/protocols/novell/novell.c
libpurple/protocols/qq/file_trans.c
libpurple/protocols/sametime/sametime.c
libpurple/protocols/simple/simple.c
libpurple/protocols/zephyr/ZSendList.c
libpurple/protocols/zephyr/ZSendNot.c
libpurple/protocols/zephyr/Zinternal.c
libpurple/protocols/zephyr/zephyr.c
libpurple/protocols/zephyr/zephyr.h
libpurple/savedstatuses.c libpurple/stun.c libpurple/upnp.c
pidgin/gtkblist.c pidgin/gtkconn.c pidgin/gtkdialogs.c
pidgin/gtkdocklet-x11.c pidgin/gtkdocklet.c pidgin/gtkidle.c
pidgin/gtkimhtml.c pidgin/gtkmain.c pidgin/gtknotify.c
pidgin/gtkprefs.c pidgin/gtksession.c pidgin/gtkstatusbox.c
pidgin/gtkthemes.c pidgin/gtkutils.c pidgin/pidgintooltip.c
pidgin/plugins/cap/cap.c pidgin/plugins/cap/cap.h
pidgin/plugins/markerline.c pidgin/plugins/pidginrc.c
pidgin/plugins/spellchk.c pidgin/plugins/ticker/ticker.c
pidgin/plugins/xmppconsole.c
ChangeLog:
Probe for -Wstrict-prototypes to get some more warnings. I then cleaned up
the existing warnings. I removed a handful of dead code and cleaned up a
couple of things that I stumbled across.
-------------- next part --------------
============================================================
--- config.h.mingw f3bfba586b00dbcb07f56374ff2b55d887b88953
+++ config.h.mingw 1e8579e0c63bd21cfbb43529a6022fe092432c07
@@ -355,7 +355,7 @@
/* Loads static protocol plugin module initialization functions. */
#ifndef STATIC_PROTO_INIT
-#define STATIC_PROTO_INIT static void static_proto_init() { }
+#define STATIC_PROTO_INIT static void static_proto_init(void) { }
#endif
/* Define to 1 if you have the ANSI C header files. */
============================================================
--- configure.ac 90a9d9ffa2d844ed646d11b3d2732036d87bc20b
+++ configure.ac 065c74becedf5b3679df4a517c623efdc00cf62b
@@ -978,7 +978,7 @@ AC_SUBST(STATIC_LINK_LIBS)
AM_CONDITIONAL(STATIC_YAHOO, test "x$static_yahoo" = "xyes")
AM_CONDITIONAL(STATIC_ZEPHYR, test "x$static_zephyr" = "xyes")
AC_SUBST(STATIC_LINK_LIBS)
-AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init() { $load_proto },
+AC_DEFINE_UNQUOTED(STATIC_PROTO_INIT, $extern_init static void static_proto_init(void) { $load_proto },
[Loads static protocol plugin module initialization functions.])
AC_ARG_WITH(dynamic_prpls, [AC_HELP_STRING([--with-dynamic-prpls], [specify which protocols to build dynamically])], [DYNAMIC_PRPLS=`echo $withval | $sedpath 's/,/ /g'`])
@@ -1086,6 +1086,7 @@ if test "x$GCC" = "xyes"; then
"-Wmissing-prototypes" \
"-Wnested-externs" \
"-Wpointer-arith" \
+ "-Wstrict-prototypes" \
"-Wundef" \
; do
orig_CFLAGS="$CFLAGS"
============================================================
--- finch/finch.c 9eb561dd105aec13a349fd7a9a6032b3c6e6e549
+++ finch/finch.c dff96613e7d1b351e713b4e2349f89c3b1ff5e5a
@@ -49,14 +49,14 @@ static void
#include "config.h"
static void
-debug_init()
+debug_init(void)
{
finch_debug_init();
purple_debug_set_ui_ops(finch_debug_get_ui_ops());
}
static GHashTable *ui_info = NULL;
-static GHashTable *finch_ui_get_info()
+static GHashTable *finch_ui_get_info(void)
{
if (ui_info == NULL) {
ui_info = g_hash_table_new(g_str_hash, g_str_equal);
@@ -91,7 +91,7 @@ static PurpleCoreUiOps *
};
static PurpleCoreUiOps *
-gnt_core_get_ui_ops()
+gnt_core_get_ui_ops(void)
{
return &core_ops;
}
============================================================
--- finch/gntaccount.c 26791f65dd048c6e2460182f167f20b0f408a7cf
+++ finch/gntaccount.c bfa0738a6e5a1d73f510c1f286bb5399cb2c7c2f
@@ -722,7 +722,7 @@ static gpointer
}
static gpointer
-finch_accounts_get_handle()
+finch_accounts_get_handle(void)
{
static int handle;
============================================================
--- finch/gntblist.c 6fa9c197e5d4186ab7c4e768de76aa894fbcce29
+++ finch/gntblist.c bd044e13ee9a4a140774d3242817869f9d5aa985
@@ -483,7 +483,7 @@ static void
}
static void
-finch_request_add_group()
+finch_request_add_group(void)
{
purple_request_input(NULL, _("Add Group"), NULL, _("Enter the name of the group"),
NULL, FALSE, FALSE, NULL,
@@ -511,7 +511,7 @@ static gpointer
};
static gpointer
-finch_blist_get_handle()
+finch_blist_get_handle(void)
{
static int handle;
@@ -1663,7 +1663,7 @@ static void
}
static void
-populate_buddylist()
+populate_buddylist(void)
{
PurpleBlistNode *node;
PurpleBuddyList *list;
@@ -1696,7 +1696,7 @@ static void
}
static void
-populate_status_dropdown()
+populate_status_dropdown(void)
{
int i;
GList *iter;
@@ -2123,7 +2123,7 @@ static void
}
static void
-reconstruct_plugins_menu()
+reconstruct_plugins_menu(void)
{
GntWidget *sub;
GntMenuItem *plg;
@@ -2155,7 +2155,7 @@ static void
}
static void
-reconstruct_accounts_menu()
+reconstruct_accounts_menu(void)
{
GntWidget *sub;
GntMenuItem *acc, *item;
@@ -2355,7 +2355,7 @@ static void
}
static void
-create_menu()
+create_menu(void)
{
GntWidget *menu, *sub, *subsub;
GntMenuItem *item;
============================================================
--- finch/gntcertmgr.c cce41a6e2a76ab86fdf12feb4f6ad640fb1e452e
+++ finch/gntcertmgr.c c09ee934a5fd21605ed386846b33cabcd3a6c597
@@ -246,7 +246,7 @@ static void
/* populate the list */
static void
-populate_cert_list()
+populate_cert_list(void)
{
GList *idlist, *l;
============================================================
--- finch/gntconv.c 4c5413a8df5e003cf7b4a3f70396066e3a4a4ed2
+++ finch/gntconv.c 79eaca4ce54d24e1b281a77d8d2cfc168dbb3e01
@@ -350,7 +350,7 @@ static gpointer
}
static gpointer
-finch_conv_get_handle()
+finch_conv_get_handle(void)
{
static int handle;
return &handle;
@@ -1119,7 +1119,7 @@ cmd_show_window(PurpleConversation *conv
static PurpleCmdRet
cmd_show_window(PurpleConversation *conv, const char *cmd, char **args, char **error, gpointer data)
{
- void (*callback)() = data;
+ void (*callback)(void) = data;
callback();
return PURPLE_CMD_STATUS_OK;
}
============================================================
--- finch/gntft.c 2c879b26141be6084dd63b0d7a0dcd8b90ced990
+++ finch/gntft.c 75afd71ad2c902635664a55ea772c232712456a6
@@ -85,7 +85,7 @@ static void
**************************************************************************/
static void
-update_title_progress()
+update_title_progress(void)
{
GList *list;
int num_active_xfers = 0;
============================================================
--- finch/gntft.h 5418fd11e071acad303b1901ba991b4a092b1591
+++ finch/gntft.h 63e65c60c5990a49fab5d0909c1d12561eaedc85
@@ -55,7 +55,7 @@ void finch_xfer_dialog_show(void);
/**
* Hides the file transfer dialog.
*/
-void finch_xfer_dialog_hide();
+void finch_xfer_dialog_hide(void);
/**
* Adds a file transfer to the dialog.
============================================================
--- finch/gntidle.c 28c35103b4cc6dbea9a6de03698e9575f5575294
+++ finch/gntidle.c 7ccab6e20579bcd55182bb7e6e20de49a9151e52
@@ -28,7 +28,7 @@ static time_t
#include "idle.h"
static time_t
-finch_get_idle_time()
+finch_get_idle_time(void)
{
return gnt_wm_get_idle_time();
}
============================================================
--- finch/gntnotify.c b3b07028152c3e874057953d1d91e865d623c47f
+++ finch/gntnotify.c 2fbafd45b4973ff8da75efa9685a3b0b39d46567
@@ -147,14 +147,14 @@ static void
}
static void
-reset_email_dialog()
+reset_email_dialog(void)
{
emaildialog.window = NULL;
emaildialog.tree = NULL;
}
static void
-setup_email_dialog()
+setup_email_dialog(void)
{
GntWidget *box, *tree, *button;
if (emaildialog.window)
============================================================
--- finch/gntplugin.c 1e89be06cc1140a22c24a5ab8ae3e3ce27769cde
+++ finch/gntplugin.c de6a2c7d1b48b79e31995896ff37ba983b42c991
@@ -171,7 +171,7 @@ static void
}
static void
-confwin_init()
+confwin_init(void)
{
confwins = g_hash_table_new(g_direct_hash, g_direct_equal);
}
============================================================
--- finch/gntplugin.h f86ee9d5db7853d7000f62637e9b534c0f59f049
+++ finch/gntplugin.h 0255cc2d3748d4e051e8a2b220c6159a3390056e
@@ -40,7 +40,7 @@
**********************************************************************/
/*@{*/
-typedef GntWidget* (*FinchPluginFrame) ();
+typedef GntWidget* (*FinchPluginFrame) (void);
/* Guess where these came from */
#define FINCH_PLUGIN_TYPE FINCH_UI
============================================================
--- finch/gntprefs.c 91ccd624d5b3d2f2772f0aa75c1617335723c32e
+++ finch/gntprefs.c f99767052ae453a6a10ecb1ce7a5b2030e6fa25f
@@ -76,17 +76,17 @@ typedef struct
PurplePrefType type;
const char *pref;
const char *label;
- GList *(*lv)(); /* If the value is to be selected from a number of choices */
+ GList *(*lv)(void); /* If the value is to be selected from a number of choices */
} Prefs;
static GList *
-get_log_options()
+get_log_options(void)
{
return purple_log_logger_get_options();
}
static GList *
-get_idle_options()
+get_idle_options(void)
{
GList *list = NULL;
list = g_list_append(list, (char *)_("Based on keyboard use"));
@@ -99,7 +99,7 @@ static GList *
}
static GList *
-get_status_titles()
+get_status_titles(void)
{
GList *list = NULL;
GList *iter;
@@ -212,7 +212,7 @@ static void
};
static void
-free_strings()
+free_strings(void)
{
g_list_foreach(pref_request.freestrings, (GFunc)g_free, NULL);
g_list_free(pref_request.freestrings);
============================================================
--- finch/gntsound.c c7433e8689f8f3a92236e3c6a692df22ca734623
+++ finch/gntsound.c b7313f38a35027b7d2509c8faf61179003cc4b9a
@@ -286,7 +286,7 @@ static void *
}
static void *
-finch_sound_get_handle()
+finch_sound_get_handle(void)
{
static int handle;
============================================================
--- finch/libgnt/gnt.h e673e6778263df354f74bd33ce4d2400ed7eac3a
+++ finch/libgnt/gnt.h cc7fa9167f0a4223dae74407f4bb7bafa78363a2
@@ -141,7 +141,7 @@ void gnt_widget_set_urgent(GntWidget *wi
* @param label The user-visible label for the action.
* @param callback The callback function for the action.
*/
-void gnt_register_action(const char *label, void (*callback)());
+void gnt_register_action(const char *label, void (*callback)(void));
/**
* Show a menu.
============================================================
--- finch/libgnt/gntbindable.c f5635a39ea603545110c173fdf1267bd3a8ef8c8
+++ finch/libgnt/gntbindable.c 46ad1068f38cce19561ac9242954eb744753e6d6
@@ -45,7 +45,7 @@ static void
} rebind_info;
static void
-gnt_bindable_free_rebind_info()
+gnt_bindable_free_rebind_info(void)
{
g_free(rebind_info.name);
g_free(rebind_info.keys);
============================================================
--- finch/libgnt/gntcolors.c 77e9ad645a3e0e458240eec63b91fe1242bd5fda
+++ finch/libgnt/gntcolors.c 8829628b201259705884de48ead1eddad1a09a8d
@@ -40,7 +40,7 @@ static void
} colors[GNT_TOTAL_COLORS];
static void
-backup_colors()
+backup_colors(void)
{
short i;
for (i = 0; i < GNT_TOTAL_COLORS; i++)
@@ -51,13 +51,13 @@ static gboolean
}
static gboolean
-can_use_custom_color()
+can_use_custom_color(void)
{
return (gnt_style_get_bool(GNT_STYLE_COLOR, FALSE) && can_change_color());
}
static void
-restore_colors()
+restore_colors(void)
{
short i;
for (i = 0; i < GNT_TOTAL_COLORS; i++)
============================================================
--- finch/libgnt/gntentry.c 1b46f2e528635e67d2a8a92a708a3de556032f58
+++ finch/libgnt/gntentry.c 1691fcf276c83124aa5e63c05d2f360fb9dc8919
@@ -916,7 +916,7 @@ static GntEntryKillRing *
}
static GntEntryKillRing *
-new_killring()
+new_killring(void)
{
GntEntryKillRing *kr = g_new0(GntEntryKillRing, 1);
kr->buffer = g_string_new(NULL);
============================================================
--- finch/libgnt/gntmain.c da0a8318d01359e7e329f8d43a6ccb7c6e5397da
+++ finch/libgnt/gntmain.c b9cb66146c14cfcf1ac8e09c37f5b79a0b378024
@@ -72,7 +72,7 @@ static void setup_io(void);
static void setup_io(void);
-static gboolean refresh_screen();
+static gboolean refresh_screen(void);
static GntWM *wm;
static GntClipboard *clipboard;
@@ -326,7 +326,7 @@ static gboolean
}
static gboolean
-refresh_screen()
+refresh_screen(void)
{
gnt_bindable_perform_action_named(GNT_BINDABLE(wm), "refresh-screen", NULL);
return FALSE;
@@ -363,7 +363,7 @@ static void
}
static void
-ask_before_exit()
+ask_before_exit(void)
{
static GntWidget *win = NULL;
GntWidget *bbox, *button;
@@ -430,7 +430,7 @@ static void
}
static void
-init_wm()
+init_wm(void)
{
const char *name = gnt_style_get(GNT_STYLE_WM);
gpointer handle;
@@ -614,7 +614,7 @@ void gnt_screen_rename_widget(GntWidget
gnt_wm_update_window(wm, widget);
}
-void gnt_register_action(const char *label, void (*callback)())
+void gnt_register_action(const char *label, void (*callback)(void))
{
GntAction *action = g_new0(GntAction, 1);
action->label = g_strdup(label);
============================================================
--- finch/libgnt/gnttextview.c 63c019020980bc6b92dca143639425e022ce602f
+++ finch/libgnt/gnttextview.c 53b8843c68b389556e8ea39ff8bebd3496ec7467
@@ -830,7 +830,7 @@ static void
static void
-cleanup_pageditor()
+cleanup_pageditor(void)
{
unlink(pageditor.file);
g_free(pageditor.file);
============================================================
--- finch/libgnt/gntwm.c ce13ad41615e73bc546144f8bbaf715d19e055b1
+++ finch/libgnt/gntwm.c c1aa99ef4cbbca6278b5c8423d7c417fd8bac7cc
@@ -135,7 +135,7 @@ static void
* to expose the entire character, it is not always redrawn.
*/
static void
-work_around_for_ncurses_bug()
+work_around_for_ncurses_bug(void)
{
#ifndef NO_WIDECHAR
PANEL *panel = NULL;
@@ -183,7 +183,7 @@ static void
}
static void
-update_act_msg()
+update_act_msg(void)
{
GntWidget *label;
GList *iter;
============================================================
--- finch/libgnt/gntwm.h 3b01184634b20d381c377f0c398bcb8117853028
+++ finch/libgnt/gntwm.h 98eed7e0a99391a3453fa13d6919a88319231c26
@@ -73,7 +73,7 @@ typedef struct _GntAction
typedef struct _GntAction
{
const char *label;
- void (*callback)();
+ void (*callback)(void);
} GntAction;
struct _GntWM
============================================================
--- finch/plugins/gntgf.c 57ac9082b8d9f5f3d1cf72f3a8fd8872a7ec9bee
+++ finch/plugins/gntgf.c c4b0747f69f968ac476f7d332ff0b3a2d4ad7f8d
@@ -122,7 +122,7 @@ static void
}
static void
-urgent()
+urgent(void)
{
/* This is from deryni/tuomov's urgent_test.c */
Display *dpy;
@@ -322,7 +322,7 @@ static GntWidget *
}
static GntWidget *
-config_frame()
+config_frame(void)
{
GntWidget *window, *tree, *check;
int i;
============================================================
--- libpurple/account.c e92b3601aefe2df60da25cf2b6ea8ef62bf7464e
+++ libpurple/account.c 5beeb530b7c219a9e25bb43cc2cf534f54d3298a
@@ -467,7 +467,7 @@ static void
}
static void
-schedule_accounts_save()
+schedule_accounts_save(void)
{
if (save_timer == 0)
save_timer = purple_timeout_add_seconds(5, save_cb, NULL);
============================================================
--- libpurple/blist.c f792c425e05032431a2dc28a627f8de0a0e2192e
+++ libpurple/blist.c 9e2030e9e75e5b512a593fd3d0dd4e902a4ccb98
@@ -298,7 +298,7 @@ static xmlnode *
}
static xmlnode *
-blist_to_xmlnode()
+blist_to_xmlnode(void)
{
xmlnode *node, *child, *grandchild;
PurpleBlistNode *gnode;
@@ -332,7 +332,7 @@ static void
}
static void
-purple_blist_sync()
+purple_blist_sync(void)
{
xmlnode *node;
char *data;
============================================================
--- libpurple/dnsquery.c c4f6cf98cc75dcea5f18c4fe2f14d46025dedd9a
+++ libpurple/dnsquery.c 0ea1d6c4fd851e8fe95a35467dad74126cfe0ffb
@@ -142,7 +142,7 @@ G_GNUC_NORETURN static void
*/
#ifdef HAVE_SIGNAL_H
G_GNUC_NORETURN static void
-trap_gdb_bug()
+trap_gdb_bug(void)
{
const char *message =
"Purple's DNS child got a SIGTRAP signal.\n"
@@ -286,7 +286,7 @@ static void
* Begin the functions for dealing with the DNS child processes.
*/
static void
-cope_with_gdb_brokenness()
+cope_with_gdb_brokenness(void)
{
#ifdef __linux__
static gboolean already_done = FALSE;
@@ -460,7 +460,7 @@ static void
static void host_resolved(gpointer data, gint source, PurpleInputCondition cond);
static void
-handle_next_queued_request()
+handle_next_queued_request(void)
{
PurpleDnsQueryData *query_data;
PurpleDnsQueryResolverProcess *resolver;
============================================================
--- libpurple/example/nullclient.c 2ae844e0fdc33d01518496374b14e9858e0a99ad
+++ libpurple/example/nullclient.c 08d9c194f25b71d19480ef876f75916c7216c197
@@ -167,7 +167,7 @@ static void
};
static void
-null_ui_init()
+null_ui_init(void)
{
/**
* This should initialize the UI components for all the modules. Here we
@@ -191,7 +191,7 @@ static void
};
static void
-init_libpurple()
+init_libpurple(void)
{
/* Set a custom user directory (optional) */
purple_util_set_user_dir(CUSTOM_USER_DIRECTORY);
@@ -250,14 +250,14 @@ static void
}
static void
-connect_to_signals_for_demonstration_purposes_only()
+connect_to_signals_for_demonstration_purposes_only(void)
{
static int handle;
purple_signal_connect(purple_connections_get_handle(), "signed-on", &handle,
PURPLE_CALLBACK(signed_on), NULL);
}
-int main()
+int main(int argc, char *argv[])
{
GList *iter;
int i, num;
============================================================
--- libpurple/idle.c be6200e5280a4dca7951aa6927e88678e2c6cfe7
+++ libpurple/idle.c ff292c22bedd9309cf58f174a479ad847d4b1db3
@@ -216,7 +216,7 @@ static gint
* Check idle and set the timer to fire at the next idle-worth event
*/
static gint
-check_idleness_timer()
+check_idleness_timer(void)
{
check_idleness();
if (time_until_next_idle_event == 0)
@@ -295,7 +295,7 @@ static void *
}
static void *
-purple_idle_get_handle()
+purple_idle_get_handle(void)
{
static int handle;
============================================================
--- libpurple/plugins/ciphertest.c edc2c13f6512e35007d664bb2bf78fd3861beb53
+++ libpurple/plugins/ciphertest.c f17b394053c74faa109c9f82b924e0063f72ba57
@@ -61,7 +61,7 @@ static void
};
static void
-cipher_test_md5() {
+cipher_test_md5(void) {
PurpleCipher *cipher;
PurpleCipherContext *context;
gchar digest[33];
@@ -113,12 +113,12 @@ struct test sha1_tests[5] = {
{"a", "86f7e437faa5a7fce15d1ddcb9eaeaea377667b8"},
{"abc", "a9993e364706816aba3e25717850c26c9cd0d89d"} ,
{"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq", "84983e441c3bd26ebaae4aa1f95129e5e54670f1"} ,
- {NULL, "34aa973cd4c4daa4f61eeb2bdbad27316534016f"},
+ {NULL, "34aa973cd4c4daa4f61eeb2bdbad27316534016f"},
{NULL, NULL}
};
static void
-cipher_test_sha1() {
+cipher_test_sha1(void) {
PurpleCipher *cipher;
PurpleCipherContext *context;
gchar digest[41];
@@ -176,7 +176,7 @@ static void
}
static void
-cipher_test_digest()
+cipher_test_digest(void)
{
const gchar *nonce = "dcd98b7102dd2f0e8b11d0f600bfb0c093";
const gchar *client_nonce = "0a4f113b";
============================================================
--- libpurple/plugins/log_reader.c 475fd202e44afd34cbb4da595bddee8e4b53eff9
+++ libpurple/plugins/log_reader.c c042ffa023b044b0e7b49fd3c2c945f8c056f04e
@@ -2426,7 +2426,7 @@ init_plugin(PurplePlugin *plugin)
}
-static void log_reader_init_prefs() {
+static void log_reader_init_prefs(void) {
char *path;
#ifdef _WIN32
char *folder;
============================================================
--- libpurple/plugins/ssl/ssl-nss.c 32128d27a651ff8eca9babb1ddab49eb17f347bd
+++ libpurple/plugins/ssl/ssl-nss.c b4378681525a3c579cd1f24556b09b07ce5705a7
@@ -109,7 +109,7 @@ set_errno(int code)
}
}
-static gchar *get_error_text()
+static gchar *get_error_text(void)
{
PRInt32 len = PR_GetErrorTextLength();
gchar *ret = NULL;
============================================================
--- libpurple/plugins/tcl/tcl.c 551fea5b44c4d71bef25090712efa9db3040c324
+++ libpurple/plugins/tcl/tcl.c 69e0bd7738b46b231ff082a257a6ea8c37458277
@@ -149,7 +149,7 @@ static int tcl_init_interp(Tcl_Interp *i
return 0;
}
-static Tcl_Interp *tcl_create_interp()
+static Tcl_Interp *tcl_create_interp(void)
{
Tcl_Interp *interp;
============================================================
--- libpurple/protocols/bonjour/bonjour.c 3784953c818a5bd105b3ea189ee86b724b1e4c48
+++ libpurple/protocols/bonjour/bonjour.c a532ad0424ce6c64941869d07dbccf1e82e234e2
@@ -617,7 +617,7 @@ static void
#endif
static void
-initialize_default_account_values()
+initialize_default_account_values(void)
{
#ifndef _WIN32
struct passwd *info;
============================================================
--- libpurple/protocols/msnp9/slpcall.c b030a1b9dbaca78638648cdba5ef30448101f2ab
+++ libpurple/protocols/msnp9/slpcall.c 1da6a4c73b7623a45bb25957e2b0b54386211e3b
@@ -34,7 +34,7 @@ static char *
**************************************************************************/
static char *
-rand_guid()
+rand_guid(void)
{
return g_strdup_printf("%4X%4X-%4X-%4X-%4X-%4X%4X%4X",
rand() % 0xAAFF + 0x1111,
============================================================
--- libpurple/protocols/novell/novell.c b1d30a11fd9da35f826a21d902c9dd1e904d9152
+++ libpurple/protocols/novell/novell.c 067060bf286afbbef12b408d7aba79f54c80072c
@@ -1029,7 +1029,7 @@ static char *
******************************************************************************/
static char *
-_user_agent_string()
+_user_agent_string(void)
{
#if !defined(_WIN32)
============================================================
--- libpurple/protocols/qq/file_trans.c 73b0c1f76c70bd9cc9220228a4130755edf8a131
+++ libpurple/protocols/qq/file_trans.c f5194733f32cb969cf43a87dc1579b60c688b35d
@@ -59,7 +59,7 @@ static guint32 _get_file_key(guint8 seed
return key;
}
-static guint32 _gen_file_key()
+static guint32 _gen_file_key(void)
{
guint8 seed;
============================================================
--- libpurple/protocols/sametime/sametime.c 0de1dc041e60b15317b970c0c3f2b69d2e522abf
+++ libpurple/protocols/sametime/sametime.c 1969dc294064a691dd92a7b18a6a99cd01eb4bc7
@@ -3806,7 +3806,7 @@ static void mw_prpl_close(PurpleConnecti
}
-static int mw_rand() {
+static int mw_rand(void) {
static int seed = 0;
/* for diversity, not security. don't touch */
@@ -3818,7 +3818,7 @@ static int mw_rand() {
/** generates a random-ish content id string */
-static char *im_mime_content_id() {
+static char *im_mime_content_id(void) {
return g_strdup_printf("%03x@%05xmeanwhile",
mw_rand() & 0xfff, mw_rand() & 0xfffff);
}
@@ -3826,7 +3826,7 @@ static char *im_mime_content_id() {
/** generates a multipart/related content type with a random-ish
boundary value */
-static char *im_mime_content_type() {
+static char *im_mime_content_type(void) {
return g_strdup_printf("multipart/related; boundary=related_MW%03x_%04x",
mw_rand() & 0xfff, mw_rand() & 0xffff);
}
============================================================
--- libpurple/protocols/simple/simple.c fa1b4565cb7ef8f352594e8f4f2334fd441f6d39
+++ libpurple/protocols/simple/simple.c b5aab5638a5346525fce65579794cce82bb23fc2
@@ -45,17 +45,17 @@
#include "dnssrv.h"
#include "ntlm.h"
-static char *gentag() {
+static char *gentag(void) {
return g_strdup_printf("%04d%04d", rand() & 0xFFFF, rand() & 0xFFFF);
}
-static char *genbranch() {
+static char *genbranch(void) {
return g_strdup_printf("z9hG4bK%04X%04X%04X%04X%04X",
rand() & 0xFFFF, rand() & 0xFFFF, rand() & 0xFFFF,
rand() & 0xFFFF, rand() & 0xFFFF);
}
-static char *gencallid() {
+static char *gencallid(void) {
return g_strdup_printf("%04Xg%04Xa%04Xi%04Xm%04Xt%04Xb%04Xx%04Xx",
rand() & 0xFFFF, rand() & 0xFFFF, rand() & 0xFFFF,
rand() & 0xFFFF, rand() & 0xFFFF, rand() & 0xFFFF,
============================================================
--- libpurple/protocols/zephyr/ZSendList.c c95bd1e3e3a12df8512201b3d266f95b2f64a797
+++ libpurple/protocols/zephyr/ZSendList.c 2f58bcfcbca9e0a4f4aa6239cdddadd7682ca472
@@ -24,7 +24,7 @@ Code_t ZSrvSendList(notice, list, nitems
char *list[];
int nitems;
Z_AuthProc cert_routine;
- Code_t (*send_routine)();
+ Code_t (*send_routine)(void);
{
Code_t retval;
ZNotice_t newnotice;
============================================================
--- libpurple/protocols/zephyr/ZSendNot.c b58f06e928ef654263d59db9889a020059f39618
+++ libpurple/protocols/zephyr/ZSendNot.c 19f4b99a77e652ab809d487eddd715a5705c7972
@@ -20,7 +20,7 @@ Code_t ZSrvSendNotice(notice, cert_routi
Code_t ZSrvSendNotice(notice, cert_routine, send_routine)
ZNotice_t *notice;
Z_AuthProc cert_routine;
- Code_t (*send_routine)();
+ Code_t (*send_routine)(void);
{
Code_t retval;
ZNotice_t newnotice;
============================================================
--- libpurple/protocols/zephyr/Zinternal.c 30c0d28efe9775636cfdb18283540a9eb0fcc9a6
+++ libpurple/protocols/zephyr/Zinternal.c 670eaa4ce8b9c2e59400bf3f5532b2ade9df30e7
@@ -33,8 +33,6 @@
#include <utmp.h>
#endif
-extern char *inet_ntoa ();
-
int __Zephyr_fd = -1;
int __Zephyr_open;
int __Zephyr_port = -1;
@@ -144,7 +142,7 @@ static int find_or_insert_uid(uid, kind)
/* Return 1 if there is a packet waiting, 0 otherwise */
-static int Z_PacketWaiting()
+static int Z_PacketWaiting(void)
{
struct timeval tv;
fd_set read;
@@ -158,7 +156,7 @@ static int Z_PacketWaiting()
/* Wait for a complete notice to become available */
-Code_t Z_WaitForComplete()
+Code_t Z_WaitForComplete(void)
{
Code_t retval;
@@ -195,9 +193,7 @@ Code_t Z_ReadEnqueue()
* notices that haven't been touched in a while
*/
-static struct _Z_InputQ *Z_SearchQueue(uid, kind)
- ZUnique_Id_t *uid;
- ZNotice_Kind_t kind;
+static struct _Z_InputQ *Z_SearchQueue(ZUnique_Id_t *uid, ZNotice_Kind_t kind)
{
register struct _Z_InputQ *qptr;
struct _Z_InputQ *next;
============================================================
--- libpurple/protocols/zephyr/zephyr.c b4d1efcb55c3639b503616bdcbb2f346f63ab901
+++ libpurple/protocols/zephyr/zephyr.c 9ed9f7e8380156a192b1007a527ebdfba49dde20
@@ -53,7 +53,7 @@ extern Code_t ZSetLocation(char *);
extern Code_t ZGetLocations(ZLocations_t *, int *);
extern Code_t ZSetLocation(char *);
-extern Code_t ZUnsetLocation();
+extern Code_t ZUnsetLocation(void);
extern Code_t ZGetSubscriptions(ZSubscription_t *, int*);
extern char __Zephyr_realm[];
typedef struct _zframe zframe;
@@ -1386,7 +1386,7 @@ static gint check_loc(gpointer data)
#endif /* WIN32 */
-static char *get_exposure_level()
+static char *get_exposure_level(void)
{
/* XXX add real error reporting */
char *exposure = ZGetVariable("exposure");
@@ -2058,7 +2058,7 @@ static int zephyr_send_message(zephyr_ac
static int zephyr_send_message(zephyr_account *zephyr,char* zclass, char* instance, char* recipient, const char *im,
const char *sig, char *opcode) ;
-static const char * zephyr_get_signature()
+static const char * zephyr_get_signature(void)
{
/* XXX add zephyr error reporting */
const char * sig =ZGetVariable("zwrite-signature");
@@ -2676,7 +2676,7 @@ static PurpleCmdRet zephyr_purple_cmd_zc
return PURPLE_CMD_RET_FAILED;
}
-static void zephyr_register_slash_commands()
+static void zephyr_register_slash_commands(void)
{
purple_cmd_register("msg","ws", PURPLE_CMD_P_PRPL,
============================================================
--- libpurple/protocols/zephyr/zephyr.h 683236ff79c4fbad18f1f1ebc8c743a193fcf1d4
+++ libpurple/protocols/zephyr/zephyr.h 0403c861781bf282ebadc930e3e41b04a8c2efba
@@ -163,9 +163,9 @@ Code_t ZSendList ZP((ZNotice_t*, char *[
Code_t ZReadAscii16 ZP((char *, int, unsigned short *));
Code_t ZSendPacket ZP((char*, int, int));
Code_t ZSendList ZP((ZNotice_t*, char *[], int, Z_AuthProc));
-Code_t ZSrvSendList ZP((ZNotice_t*, char*[], int, Z_AuthProc, Code_t (*)()));
+Code_t ZSrvSendList ZP((ZNotice_t*, char*[], int, Z_AuthProc, Code_t (*)(void)));
Code_t ZSendNotice ZP((ZNotice_t *, Z_AuthProc));
-Code_t ZSrvSendNotice ZP((ZNotice_t*, Z_AuthProc, Code_t (*)()));
+Code_t ZSrvSendNotice ZP((ZNotice_t*, Z_AuthProc, Code_t (*)(void)));
Code_t ZFormatNotice ZP((ZNotice_t*, char**, int*, Z_AuthProc));
Code_t ZFormatSmallNotice ZP((ZNotice_t*, ZPacket_t, int*, Z_AuthProc));
Code_t ZFormatRawNoticeList ZP((ZNotice_t *notice, char *list[], int nitems,
============================================================
--- libpurple/savedstatuses.c 2854bef9ad835caf41f9153787e74e6394af6fc1
+++ libpurple/savedstatuses.c 065fd351605b5daaaa3021bfca8e2f64fd729ffa
@@ -190,7 +190,7 @@ static void
* does the expiration.
*/
static void
-remove_old_transient_statuses()
+remove_old_transient_statuses(void)
{
GList *l, *next;
PurpleSavedStatus *saved_status, *current_status;
============================================================
--- libpurple/stun.c 4a79dd2c4c4216efb4a944125b0fcb6e355121d0
+++ libpurple/stun.c e32c63a72d633dd1f0989716cb866e05b496df9e
@@ -104,7 +104,7 @@ static void close_stun_conn(struct stun_
g_free(sc);
}
-static void do_callbacks() {
+static void do_callbacks(void) {
while(callbacks) {
StunCallback cb = callbacks->data;
if(cb)
============================================================
--- libpurple/upnp.c 78c0017916277fdb5bc0000cca06c35fb3a031ff
+++ libpurple/upnp.c 06cd7ead155ebaaf4e736c5e7e59774b5511723f
@@ -777,7 +777,7 @@ static const gchar *
/* TODO: This could be exported */
static const gchar *
-purple_upnp_get_internal_ip()
+purple_upnp_get_internal_ip(void)
{
if (control_info.status == PURPLE_UPNP_STATUS_DISCOVERED
&& control_info.internalip
============================================================
--- pidgin/gtkblist.c f536b44af29c52619a5890a270559b72a2ef607f
+++ pidgin/gtkblist.c 85eeacfbb939c246dc173e19b36a2938ec615d3e
@@ -177,7 +177,7 @@ static char dim_grey_string[8] = "";
} PidginBlistNode;
static char dim_grey_string[8] = "";
-static char *dim_grey()
+static char *dim_grey(void)
{
if (!gtkblist)
return "dim grey";
@@ -708,12 +708,12 @@ static void gtk_blist_menu_showoffline_c
pidgin_blist_update(purple_get_blist(), node);
}
-static void gtk_blist_show_systemlog_cb()
+static void gtk_blist_show_systemlog_cb(void)
{
pidgin_syslog_show();
}
-static void gtk_blist_show_onlinehelp_cb()
+static void gtk_blist_show_onlinehelp_cb(void)
{
purple_notify_uri(NULL, PURPLE_WEBSITE "documentation");
}
@@ -1117,7 +1117,7 @@ static void gtk_blist_row_activated_cb(G
}
}
-static void pidgin_blist_add_chat_cb()
+static void pidgin_blist_add_chat_cb(void)
{
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
GtkTreeIter iter;
@@ -1137,7 +1137,7 @@ static void pidgin_blist_add_chat_cb()
}
}
-static void pidgin_blist_add_buddy_cb()
+static void pidgin_blist_add_buddy_cb(void)
{
GtkTreeSelection *sel = gtk_tree_view_get_selection(GTK_TREE_VIEW(gtkblist->treeview));
GtkTreeIter iter;
@@ -2761,7 +2761,7 @@ static void
}
static void
-pidgin_blist_destroy_tooltip_data()
+pidgin_blist_destroy_tooltip_data(void)
{
while(gtkblist->tooltipdata) {
struct tooltip_data *td = gtkblist->tooltipdata->data;
@@ -3750,7 +3750,7 @@ gchar *pidgin_blist_get_name_markup(Purp
return text;
}
-static void pidgin_blist_restore_position()
+static void pidgin_blist_restore_position(void)
{
int blist_x, blist_y, blist_width, blist_height;
@@ -3897,7 +3897,7 @@ static void
}
static void
-unseen_conv_menu()
+unseen_conv_menu(void)
{
static GtkWidget *menu = NULL;
GList *convs = NULL;
@@ -4183,7 +4183,7 @@ void pidgin_blist_setup_sort_methods()
pidgin_blist_sort_method_set(purple_prefs_get_string(PIDGIN_PREFS_ROOT "/blist/sort_type"));
}
-static void _prefs_change_redo_list()
+static void _prefs_change_redo_list(void)
{
GtkTreeSelection *sel;
GtkTreeIter iter;
============================================================
--- pidgin/gtkconn.c 6f8927b4e7c286779b591ffd092c28d82e490261
+++ pidgin/gtkconn.c 365d788786f595979052395da69a7296580881de
@@ -177,7 +177,7 @@ pidgin_connection_report_disconnect_reas
}
}
-static void pidgin_connection_network_connected ()
+static void pidgin_connection_network_connected (void)
{
GList *list, *l;
PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
@@ -196,7 +196,7 @@ static void pidgin_connection_network_co
g_list_free(list);
}
-static void pidgin_connection_network_disconnected ()
+static void pidgin_connection_network_disconnected (void)
{
GList *list, *l;
PidginBuddyList *gtkblist = pidgin_blist_get_default_gtk_blist();
============================================================
--- pidgin/gtkdialogs.c 37b84d6ef1669f7357d1842b847c188694ad5125
+++ pidgin/gtkdialogs.c 5855a379b616a182d92d17ac0494e8a70635a9a2
@@ -288,7 +288,7 @@ pidgin_dialogs_destroy_all()
}
}
-static void destroy_about()
+static void destroy_about(void)
{
if (about != NULL)
gtk_widget_destroy(about);
============================================================
--- pidgin/gtkdocklet-x11.c e39dd8dec333fa6e1f8796e4b2a891ee1d6f00d8
+++ pidgin/gtkdocklet-x11.c 14cdda36a2c9dd6f1fd2bb200d84d3bf7cfa5cf1
@@ -48,7 +48,7 @@ static gboolean
static void docklet_x11_create(gboolean);
static gboolean
-docklet_x11_recreate_cb()
+docklet_x11_recreate_cb(void)
{
docklet_x11_create(TRUE);
@@ -147,7 +147,7 @@ static void
}
static void
-docklet_x11_blank_icon()
+docklet_x11_blank_icon(void)
{
if (!blank_icon) {
GtkIconSize size = GTK_ICON_SIZE_LARGE_TOOLBAR;
@@ -205,7 +205,7 @@ static void
#endif
static void
-docklet_x11_destroy()
+docklet_x11_destroy(void)
{
g_return_if_fail(docklet != NULL);
@@ -230,7 +230,7 @@ static gboolean
}
static gboolean
-docklet_x11_embed_timeout_cb()
+docklet_x11_embed_timeout_cb(void)
{
/* The docklet was not embedded within the timeout.
* Remove it as a visibility manager, but leave the plugin
@@ -301,7 +301,7 @@ static void
}
static void
-docklet_x11_create_ui_op()
+docklet_x11_create_ui_op(void)
{
docklet_x11_create(FALSE);
}
============================================================
--- pidgin/gtkdocklet.c eb381eaeaf3ae8d80086b549cbb67dde2c4b937f
+++ pidgin/gtkdocklet.c 6399ebfbb27560d05db15d4885fca187001a0238
@@ -62,7 +62,7 @@ static gboolean
* docklet status and utility functions
**************************************************************************/
static gboolean
-docklet_blink_icon()
+docklet_blink_icon(void)
{
static gboolean blinked = FALSE;
gboolean ret = FALSE; /* by default, don't keep blinking */
@@ -108,7 +108,7 @@ static gboolean
}
static gboolean
-docklet_update_status()
+docklet_update_status(void)
{
GList *convs, *l;
int count;
@@ -219,7 +219,7 @@ static gboolean
}
static gboolean
-online_account_supports_chat()
+online_account_supports_chat(void)
{
GList *c = NULL;
c = purple_connections_get_all();
@@ -523,7 +523,7 @@ static GtkWidget *
}
static GtkWidget *
-docklet_status_submenu()
+docklet_status_submenu(void)
{
GtkWidget *submenu, *menuitem;
GList *popular_statuses, *cur;
@@ -667,7 +667,8 @@ static void
}
static void
-docklet_menu() {
+docklet_menu(void)
+{
static GtkWidget *menu = NULL;
GtkWidget *menuitem;
============================================================
--- pidgin/gtkidle.c 493273f5466bb7b1040d127f0424cacdd6b60c8f
+++ pidgin/gtkidle.c 5a3dc14b3605fc65bb4b6db0f9a56a72446d596f
@@ -69,7 +69,7 @@ static time_t
*/
#if defined(USE_SCREENSAVER) || defined(HAVE_IOKIT)
static time_t
-pidgin_get_time_idle()
+pidgin_get_time_idle(void)
{
# ifdef HAVE_IOKIT
/* Query the IOKit API */
============================================================
--- pidgin/gtkimhtml.c f8fdf993787bc905cd25727388eec50f321e3070
+++ pidgin/gtkimhtml.c a05ea766de39e957c48f577279b12d590b9edd25
@@ -289,7 +289,7 @@ static GtkSmileyTree*
#endif
static GtkSmileyTree*
-gtk_smiley_tree_new ()
+gtk_smiley_tree_new (void)
{
return g_new0 (GtkSmileyTree, 1);
}
============================================================
--- pidgin/gtkmain.c 985a2b4724e17ba4871989c2cbb97b5240eb6bce
+++ pidgin/gtkmain.c d73d7dafe46c731c7dc4d1bec9c8e146f532403d
@@ -174,7 +174,7 @@ static void
* be wise to move this code into gtksound.c.
*/
static void
-clean_pid()
+clean_pid(void)
{
int status;
pid_t pid;
@@ -241,7 +241,7 @@ static int
#endif
static int
-ui_main()
+ui_main(void)
{
#ifndef _WIN32
GList *icons = NULL;
@@ -359,7 +359,7 @@ pidgin_quit(void)
gtk_main_quit();
}
-static GHashTable *pidgin_ui_get_info()
+static GHashTable *pidgin_ui_get_info(void)
{
if(NULL == ui_info) {
ui_info = g_hash_table_new(g_str_hash, g_str_equal);
============================================================
--- pidgin/gtknotify.c 1a76f8520e461e3eec1ed38571203af556d7d599
+++ pidgin/gtknotify.c e63cacd8e7e7eb881bab9e964704eaa100d67233
@@ -332,7 +332,7 @@ static GtkWidget *
}
static GtkWidget *
-pidgin_get_mail_dialog()
+pidgin_get_mail_dialog(void)
{
if (mail_dialog == NULL) {
GtkWidget *dialog = NULL;
@@ -604,7 +604,7 @@ static GtkIMHtmlOptions
}
static GtkIMHtmlOptions
-notify_imhtml_options()
+notify_imhtml_options(void)
{
GtkIMHtmlOptions options = 0;
============================================================
--- pidgin/gtkprefs.c 97d9b2e0e4f42f4af28d6f07b84728c20bedfe02
+++ pidgin/gtkprefs.c bc4b98a8f31e52f8a47aa88332870c3b28aebfba
@@ -412,7 +412,7 @@ static void smiley_sel(GtkTreeSelection
gtk_tree_path_free(path);
}
-static GtkTreeRowReference *theme_refresh_theme_list()
+static GtkTreeRowReference *theme_refresh_theme_list(void)
{
GdkPixbuf *pixbuf;
GSList *themes;
@@ -676,7 +676,7 @@ static GtkWidget *
}
static GtkWidget *
-theme_page()
+theme_page(void)
{
GtkWidget *add_button, *remove_button;
GtkWidget *hbox_buttons;
@@ -877,7 +877,7 @@ static GtkWidget *
}
static GtkWidget *
-interface_page()
+interface_page(void)
{
GtkWidget *ret;
GtkWidget *vbox;
@@ -970,7 +970,7 @@ static GtkWidget *
#endif
static GtkWidget *
-conv_page()
+conv_page(void)
{
GtkWidget *ret;
GtkWidget *vbox;
@@ -1137,7 +1137,7 @@ static GtkWidget *
}
static GtkWidget *
-network_page()
+network_page(void)
{
GtkWidget *ret;
GtkWidget *vbox, *hbox, *entry;
@@ -1411,7 +1411,7 @@ static gboolean manual_browser_set(GtkWi
return FALSE;
}
-static GList *get_available_browsers()
+static GList *get_available_browsers(void)
{
struct browser {
char *name;
@@ -1477,7 +1477,7 @@ static GtkWidget *
}
static GtkWidget *
-browser_page()
+browser_page(void)
{
GtkWidget *ret;
GtkWidget *vbox;
@@ -1550,7 +1550,7 @@ static GtkWidget *
#endif /*_WIN32*/
static GtkWidget *
-logging_page()
+logging_page(void)
{
GtkWidget *ret;
GtkWidget *vbox;
@@ -1778,7 +1778,7 @@ static GtkWidget *
}
static GtkWidget *
-sound_page()
+sound_page(void)
{
GtkWidget *ret;
GtkWidget *vbox, *sw, *button;
@@ -2005,7 +2005,7 @@ static GtkWidget *
}
static GtkWidget *
-away_page()
+away_page(void)
{
GtkWidget *ret;
GtkWidget *vbox;
@@ -2130,7 +2130,7 @@ prefs_notebook_add_page(const char *text
#endif
}
-static void prefs_notebook_init() {
+static void prefs_notebook_init(void) {
prefs_notebook_add_page(_("Interface"), interface_page(), notebook_page++);
prefs_notebook_add_page(_("Conversations"), conv_page(), notebook_page++);
prefs_notebook_add_page(_("Smiley Themes"), theme_page(), notebook_page++);
============================================================
--- pidgin/gtksession.c c5bdf83b7582937e55a3c7b702e11be00af1b904
+++ pidgin/gtksession.c e46b17c200808da0adee7dcce6b62d9252c5b9ae
@@ -124,7 +124,7 @@ static void ice_io_error_handler(IceConn
purple_debug(PURPLE_DEBUG_INFO, NULL, "done.\n");
}
-static void ice_init() {
+static void ice_init(void) {
IceIOErrorHandler default_handler;
ice_installed_io_error_handler = IceSetIOErrorHandler(NULL);
============================================================
--- pidgin/gtkstatusbox.c ae800cb6003afc70b739c59b44aa3580f3f86562
+++ pidgin/gtkstatusbox.c d7e0ab285aa24153769221f863fb04d5553f4bd2
@@ -949,7 +949,7 @@ add_popular_statuses(PidginStatusBox *st
/* This returns NULL if the active accounts don't have identical
* statuses and a token account if they do */
-static PurpleAccount* check_active_accounts_for_identical_statuses()
+static PurpleAccount* check_active_accounts_for_identical_statuses(void)
{
PurpleAccount *acct = NULL, *acct2;
GList *tmp, *tmp2, *active_accts = purple_accounts_get_all_active();
============================================================
--- pidgin/gtkthemes.c 3c4b8c1fdae245185620140d54dd9ac73898b705
+++ pidgin/gtkthemes.c b99c6f0a562c6a26d2b96c15afad6d8ea41c9d58
@@ -168,7 +168,7 @@ static void
}
static void
-pidgin_smiley_themes_remove_non_existing()
+pidgin_smiley_themes_remove_non_existing(void)
{
static struct smiley_theme *theme = NULL;
GSList *iter = NULL;
============================================================
--- pidgin/gtkutils.c 445a4bc847e82a5118d005659811f8fe4a7b9f13
+++ pidgin/gtkutils.c 8229f51f17c21847b2a4caf768da7a3997286155
@@ -2947,7 +2947,7 @@ static void *
GSList *minidialogs = NULL;
static void *
-pidgin_utils_get_handle()
+pidgin_utils_get_handle(void)
{
static int handle;
============================================================
--- pidgin/pidgintooltip.c 319c94ffce55c8ae998dfcfc646eb80e7133f7bc
+++ pidgin/pidgintooltip.c 5d2a618c9de8a0d329805755179d5a02cecab5f2
@@ -86,7 +86,7 @@ static GtkWidget*
}
static GtkWidget*
-setup_tooltip_window()
+setup_tooltip_window(void)
{
const char *name;
GtkWidget *tipwindow;
============================================================
--- pidgin/plugins/cap/cap.c e140644344270ed1a7b79ea7d33a433875bacc18
+++ pidgin/plugins/cap/cap.c ab897523fda373afe352cc2d86778ad496c98f50
@@ -434,26 +434,6 @@ static void buddy_signed_off(PurpleBuddy
stats->last_seen = time(NULL);
}
-static void buddy_idle(PurpleBuddy *buddy, gboolean old_idle, gboolean idle) {
-}
-
-#if 0
-static void blist_node_extended_menu(PurpleBlistNode *node, GList **menu) {
- PurpleBuddy *buddy;
- PurpleMenuAction *menu_action;
- purple_debug_info("cap", "got extended blist menu\n");
- purple_debug_info("cap", "is buddy: %d\n", PURPLE_BLIST_NODE_IS_BUDDY(node));
- purple_debug_info("cap", "is contact: %d\n", PURPLE_BLIST_NODE_IS_CONTACT(node));
- purple_debug_info("cap", "is group: %d\n", PURPLE_BLIST_NODE_IS_GROUP(node));
- /* Probably only concerned with buddy/contact types. Contacts = meta-buddies (grouped msn/jabber/etc.) */
- g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
- buddy = (PurpleBuddy *)node;
- menu_action = purple_menu_action_new(_("Display Statistics"),
- PURPLE_CALLBACK(display_statistics_action_cb), NULL, NULL);
- *menu = g_list_append(*menu, menu_action);
-}
-#endif
-
/* drawing-tooltip */
static void drawing_tooltip(PurpleBlistNode *node, GString *text, gboolean full) {
if(node->type == PURPLE_BLIST_BUDDY_NODE) {
@@ -662,15 +642,6 @@ static void insert_word_count(const char
/* result = dbi_conn_queryf(_conn, "insert into cap_message values(\'%s\', \'%s\', %d, now());", sender, receiver, count); */
}
-/* Callbacks */
-void display_statistics_action_cb(PurpleBlistNode *node, gpointer data) {
- PurpleBuddy *buddy;
-
- g_return_if_fail(PURPLE_BLIST_NODE_IS_BUDDY(node));
- buddy = (PurpleBuddy *)node;
- purple_debug_info("cap", "Statistics for %s requested.\n", buddy->name);
-}
-
/* Purple plugin specific code */
static gboolean plugin_load(PurplePlugin *plugin) {
@@ -714,9 +685,6 @@ static void add_plugin_functionality(Pur
purple_signal_connect(purple_blist_get_handle(), "buddy-signed-off", plugin,
PURPLE_CALLBACK(buddy_signed_off), NULL);
- /*purple_signal_connect(purple_blist_get_handle(), "blist-node-extended-menu", plugin,
- PURPLE_CALLBACK(blist_node_extended_menu), NULL);*/
-
purple_signal_connect(pidgin_blist_get_handle(), "drawing-tooltip", plugin,
PURPLE_CALLBACK(drawing_tooltip), NULL);
@@ -726,9 +694,6 @@ static void add_plugin_functionality(Pur
purple_signal_connect(purple_connections_get_handle(), "signed-off", plugin,
PURPLE_CALLBACK(signed_off), NULL);
- purple_signal_connect(purple_blist_get_handle(), "buddy-idle-changed", plugin,
- PURPLE_CALLBACK(buddy_idle), NULL);
-
_signals_connected = TRUE;
}
@@ -765,9 +730,6 @@ static void remove_plugin_functionality(
purple_signal_disconnect(purple_blist_get_handle(), "buddy-signed-off", plugin,
PURPLE_CALLBACK(buddy_signed_off));
- /*purple_signal_disconnect(purple_blist_get_handle(), "blist-node-extended-menu", plugin,
- PURPLE_CALLBACK(blist_node_extended_menu));*/
-
purple_signal_disconnect(pidgin_blist_get_handle(), "drawing-tooltip", plugin,
PURPLE_CALLBACK(drawing_tooltip));
@@ -777,9 +739,6 @@ static void remove_plugin_functionality(
purple_signal_disconnect(purple_connections_get_handle(), "signed-off", plugin,
PURPLE_CALLBACK(signed_off));
- purple_signal_disconnect(purple_blist_get_handle(), "buddy-idle-changed", plugin,
- PURPLE_CALLBACK(buddy_idle));
-
_signals_connected = FALSE;
}
============================================================
--- pidgin/plugins/cap/cap.h 1cd5e2797a15a24d489a07c690b1be143a02f2bb
+++ pidgin/plugins/cap/cap.h 7dbf754b47c0dcdaad566349f63a248eeb1c5240
@@ -98,7 +98,6 @@ static void buddy_signed_off(PurpleBuddy
static void buddy_signed_on(PurpleBuddy *buddy);
/* buddy-signed-off */
static void buddy_signed_off(PurpleBuddy *buddy);
-static void buddy_idle(PurpleBuddy *buddy, gboolean old_idle, gboolean idle);
/* drawing-tooltip */
static void drawing_tooltip(PurpleBlistNode *node, GString *text, gboolean full);
/* signed-on */
@@ -107,21 +106,20 @@ static PurpleStatus * get_status_for(Pur
static void signed_off(PurpleConnection *gc);
static void reset_all_last_message_times(gpointer key, gpointer value, gpointer user_data);
static PurpleStatus * get_status_for(PurpleBuddy *buddy);
-static void create_tables();
-static gboolean create_database_connection();
-static void destroy_database_connection();
+static void create_tables(void);
+static gboolean create_database_connection(void);
+static void destroy_database_connection(void);
static guint word_count(const gchar *string);
static void insert_status_change(CapStatistics *statistics);
static void insert_status_change_from_purple_status(CapStatistics *statistics, PurpleStatus *status);
static void insert_word_count(const char *sender, const char *receiver, guint count);
-void display_statistics_action_cb(PurpleBlistNode *node, gpointer data);
static gboolean plugin_load(PurplePlugin *plugin);
static void add_plugin_functionality(PurplePlugin *plugin);
static void cancel_conversation_timeouts(gpointer key, gpointer value, gpointer user_data);
static void remove_plugin_functionality(PurplePlugin *plugin);
static void write_stats_on_unload(gpointer key, gpointer value, gpointer user_data);
static gboolean plugin_unload(PurplePlugin *plugin);
-static CapPrefsUI * create_cap_prefs_ui();
+static CapPrefsUI * create_cap_prefs_ui(void);
static void cap_prefs_ui_destroy_cb(GtkObject *object, gpointer user_data);
static void numeric_spinner_prefs_cb(GtkSpinButton *spinbutton, gpointer user_data);
static GtkWidget * get_config_frame(PurplePlugin *plugin);
============================================================
--- pidgin/plugins/markerline.c 58e1b8aeb9cec0b246973ed0d715ea41ec5e1aa8
+++ pidgin/plugins/markerline.c 594a5b3d40cc7b12536ea9bd9b534c8914ec4b82
@@ -190,13 +190,13 @@ static void
}
static void
-detach_from_all_windows()
+detach_from_all_windows(void)
{
g_list_foreach(pidgin_conv_windows_get_list(), (GFunc)detach_from_pidgin_window, NULL);
}
static void
-attach_to_all_windows()
+attach_to_all_windows(void)
{
g_list_foreach(pidgin_conv_windows_get_list(), (GFunc)attach_to_pidgin_window, NULL);
}
============================================================
--- pidgin/plugins/pidginrc.c f80804f77af21b064626d4aa16cecdfd5d4ec3a5
+++ pidgin/plugins/pidginrc.c fc41e944d39fee26ec2b647a84ddeb1d590f5ee6
@@ -95,7 +95,7 @@ static GString *
*/
static GString *
-make_gtkrc_string()
+make_gtkrc_string(void)
{
gint i;
gchar *prefbase = NULL;
@@ -185,7 +185,7 @@ static void
}
static void
-purplerc_make_changes()
+purplerc_make_changes(void)
{
GString *str = make_gtkrc_string();
#if GTK_CHECK_VERSION(2,4,0)
============================================================
--- pidgin/plugins/spellchk.c bc5aaaded4722107ea3a5e39f278d32c29c7179e
+++ pidgin/plugins/spellchk.c 14ce8bbe96e4c6fe8541b42423696da82a69a295
@@ -695,7 +695,7 @@ static int buf_get_line(char *ibuf, char
return 1;
}
-static void load_conf()
+static void load_conf(void)
{
/* Corrections to change "...", "(c)", "(r)", and "(tm)" to their
* Unicode character equivalents were not added here even though
@@ -1912,7 +1912,7 @@ static void case_sensitive_toggled(GtkCe
save_list();
}
-static void list_add_new()
+static void list_add_new(void)
{
GtkTreeIter iter;
const char *word = gtk_entry_get_text(GTK_ENTRY(bad_entry));
@@ -2015,7 +2015,7 @@ static void remove_row(void *data1, gpoi
gtk_tree_row_reference_free(row_reference);
}
-static void list_delete()
+static void list_delete(void)
{
GtkTreeSelection *sel;
GSList *list = NULL;
============================================================
--- pidgin/plugins/ticker/ticker.c 9bcb12fe98bd4b0aa82354cdab6ba674a5a300cb
+++ pidgin/plugins/ticker/ticker.c 1195ddee375ef7f44ec0ec1875882c4e24870e30
@@ -65,7 +65,7 @@ static gboolean buddy_ticker_destroy_win
return TRUE; /* don't actually destroy the window */
}
-static void buddy_ticker_create_window() {
+static void buddy_ticker_create_window(void) {
if(tickerwindow) {
gtk_widget_show(tickerwindow);
return;
@@ -215,7 +215,7 @@ static void buddy_ticker_remove_buddy(Pu
buddy_ticker_update_contact(c);
}
-static void buddy_ticker_show()
+static void buddy_ticker_show(void)
{
PurpleBuddyList *list = purple_get_blist();
PurpleBlistNode *gnode, *cnode, *bnode;
============================================================
--- pidgin/plugins/xmppconsole.c b861b16832614c05125669304d2a3580af55ebf1
+++ pidgin/plugins/xmppconsole.c f54fcf4f1510c802bdb3609dd505d3a0fe00a022
@@ -727,7 +727,7 @@ static void
}
static void
-create_console()
+create_console(void)
{
GtkWidget *vbox = gtk_vbox_new(FALSE, 6);
GtkWidget *sw = gtk_scrolled_window_new(NULL, NULL);
More information about the Commits
mailing list