# HG changeset patch # User Sadrul Habib Chowdhury # Date 1155958703 0 # Node ID c65ed4f6eea83bf03a097adaab8c862b2067c403 # Parent f1270dc1d9d23e31a5446d7d26550d74ebd30df6 [gaim-migrate @ 16870] Do the right thing: remove the compile warnings. committer: Tailor Script diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntaccount.h --- a/console/gntaccount.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntaccount.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,10 +1,14 @@ +#ifndef _GNT_ACCOUNT_H +#define _GNT_ACCOUNT_H + #include "account.h" -GaimAccountUiOps *gg_accounts_get_ui_ops(); +GaimAccountUiOps *gg_accounts_get_ui_ops(void); -void gg_accounts_init(); +void gg_accounts_init(void); -void gg_accounts_uninit(); +void gg_accounts_uninit(void); -void gg_accounts_show_all(); +void gg_accounts_show_all(void); +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntblist.c --- a/console/gntblist.c Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntblist.c Sat Aug 19 03:38:23 2006 +0000 @@ -672,8 +672,8 @@ static void gg_blist_remove_node_cb(GaimBlistNode *node, GaimBlistNode *null) { - char *primary, *sec = NULL; - const char *name; + char *primary; + const char *name, *sec = NULL; if (GAIM_BLIST_NODE_IS_BUDDY(node)) name = gaim_buddy_get_name((GaimBuddy*)node); diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntblist.h --- a/console/gntblist.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntblist.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,12 +1,15 @@ +#ifndef _GNT_BLIST_H +#define _GNT_BLIST_H + #include "blist.h" -GaimBlistUiOps * gg_blist_get_ui_ops(); +GaimBlistUiOps * gg_blist_get_ui_ops(void); -void gg_blist_init(); +void gg_blist_init(void); -void gg_blist_uninit(); +void gg_blist_uninit(void); -void gg_blist_show(); +void gg_blist_show(void); void gg_blist_get_position(int *x, int *y); @@ -16,3 +19,4 @@ void gg_blist_set_size(int width, int height); +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntconn.h --- a/console/gntconn.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntconn.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,8 +1,12 @@ +#ifndef _GNT_CONN_H +#define _GNT_CONN_H + #include "connection.h" -GaimConnectionUiOps *gg_connections_get_ui_ops(); +GaimConnectionUiOps *gg_connections_get_ui_ops(void); + +void gg_connections_init(void); -void gg_connections_init(); +void gg_connections_uninit(void); -void gg_connections_uninit(); - +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntconv.h --- a/console/gntconv.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntconv.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,7 +1,12 @@ +#ifndef _GNT_CONV_H +#define _GNT_CONV_H + #include "conversation.h" -GaimConversationUiOps *gg_conv_get_ui_ops(); +GaimConversationUiOps *gg_conv_get_ui_ops(void); + +void gg_conversation_init(void); -void gg_conversation_init(); +void gg_conversation_uninit(void); -void gg_conversation_uninit(); +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntdebug.h --- a/console/gntdebug.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntdebug.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,9 +1,14 @@ +#ifndef _GNT_DEBUG_H +#define _GNT_DEBUG_H + #include "debug.h" -GaimDebugUiOps *gg_debug_get_ui_ops(); +GaimDebugUiOps *gg_debug_get_ui_ops(void); -void gg_debug_init(); +void gg_debug_init(void); -void gg_debug_uninit(); +void gg_debug_uninit(void); -void gg_debug_window_show(); +void gg_debug_window_show(void); + +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntgaim.c --- a/console/gntgaim.c Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntgaim.c Sat Aug 19 03:38:23 2006 +0000 @@ -129,7 +129,7 @@ (guint (*)(guint))g_source_remove }; -GaimEventLoopUiOps * +static GaimEventLoopUiOps * gnt_eventloop_get_ui_ops(void) { return &eventloop_ops; diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntgaim.h --- a/console/gntgaim.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntgaim.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,6 +1,6 @@ #include -#include + +#include "libgaim/internal.h" #define GAIM_GNT_UI "gnt-gaim" -#define _(x) x diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntnotify.c --- a/console/gntnotify.c Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntnotify.c Sat Aug 19 03:38:23 2006 +0000 @@ -293,6 +293,8 @@ case GAIM_NOTIFY_BUTTON_INVITE: text = _("Invite"); break; + default: + text = _("(none)"); } button = gnt_button_new(text); diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntnotify.h --- a/console/gntnotify.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntnotify.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,8 +1,13 @@ +#ifndef _GNT_NOTIFY_H +#define _GNT_NOTIFY_H + #include "notify.h" -GaimNotifyUiOps *gg_notify_get_ui_ops(); +GaimNotifyUiOps *gg_notify_get_ui_ops(void); + +void gg_notify_init(void); -void gg_notify_init(); +void gg_notify_uninit(void); -void gg_notify_uninit(); +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntplugin.h --- a/console/gntplugin.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntplugin.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,3 +1,6 @@ +#ifndef _GNT_PLUGIN_H +#define _GNT_PLUGIN_H + #include #include @@ -16,7 +19,8 @@ #define GAIM_GNT_PLUGIN_UI_INFO(plugin) \ (GGPluginFrame)((plugin)->info->ui_info) -void gg_plugins_show_all(); +void gg_plugins_show_all(void); -void gg_plugins_save_loaded(); +void gg_plugins_save_loaded(void); +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntprefs.c --- a/console/gntprefs.c Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntprefs.c Sat Aug 19 03:38:23 2006 +0000 @@ -46,15 +46,15 @@ switch (prefs->type) { case GAIM_PREF_BOOLEAN: - field = gaim_request_field_bool_new(prefs->pref, prefs->label, + field = gaim_request_field_bool_new(prefs->pref, _(prefs->label), gaim_prefs_get_bool(prefs->pref)); break; case GAIM_PREF_INT: - field = gaim_request_field_int_new(prefs->pref, prefs->label, + field = gaim_request_field_int_new(prefs->pref, _(prefs->label), gaim_prefs_get_int(prefs->pref)); break; case GAIM_PREF_STRING: - field = gaim_request_field_string_new(prefs->pref, prefs->label, + field = gaim_request_field_string_new(prefs->pref, _(prefs->label), gaim_prefs_get_string(prefs->pref), FALSE); break; default: @@ -64,7 +64,7 @@ else { GList *list = prefs->lv(), *iter; - field = gaim_request_field_list_new(prefs->pref, prefs->label); + field = gaim_request_field_list_new(prefs->pref, _(prefs->label)); for (iter = list; iter; iter = iter->next) { gboolean select = FALSE; @@ -98,23 +98,23 @@ static Prefs blist[] = { - {GAIM_PREF_BOOLEAN, "/gaim/gnt/blist/idletime", _("Show Idle Time"), NULL}, + {GAIM_PREF_BOOLEAN, "/gaim/gnt/blist/idletime", N_("Show Idle Time"), NULL}, {GAIM_PREF_NONE, NULL, NULL, NULL} }; static Prefs convs[] = { - {GAIM_PREF_BOOLEAN, "/gaim/gnt/conversations/timestamps", _("Show Timestamps"), NULL}, - {GAIM_PREF_BOOLEAN, "/gaim/gnt/conversations/notify_typing", _("Notify buddies when you are typing"), NULL}, + {GAIM_PREF_BOOLEAN, "/gaim/gnt/conversations/timestamps", N_("Show Timestamps"), NULL}, + {GAIM_PREF_BOOLEAN, "/gaim/gnt/conversations/notify_typing", N_("Notify buddies when you are typing"), NULL}, {GAIM_PREF_NONE, NULL, NULL, NULL} }; static Prefs logging[] = { - {GAIM_PREF_STRING, "/core/logging/format", _("Log format"), get_log_options}, - {GAIM_PREF_BOOLEAN, "/core/logging/log_ims", _("Log IMs"), NULL}, - {GAIM_PREF_BOOLEAN, "/core/logging/log_chats", _("Log chats"), NULL}, - {GAIM_PREF_BOOLEAN, "/core/logging/log_system", _("Log status change events"), NULL}, + {GAIM_PREF_STRING, "/core/logging/format", N_("Log format"), get_log_options}, + {GAIM_PREF_BOOLEAN, "/core/logging/log_ims", N_("Log IMs"), NULL}, + {GAIM_PREF_BOOLEAN, "/core/logging/log_chats", N_("Log chats"), NULL}, + {GAIM_PREF_BOOLEAN, "/core/logging/log_system", N_("Log status change events"), NULL}, {GAIM_PREF_NONE, NULL, NULL, NULL}, }; diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntprefs.h --- a/console/gntprefs.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntprefs.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,4 +1,8 @@ -void gg_prefs_init(); +#ifndef _GNT_PREFS_H +#define _GNT_PREFS_H -void gg_prefs_show_all(); +void gg_prefs_init(void); +void gg_prefs_show_all(void); + +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntrequest.c --- a/console/gntrequest.c Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntrequest.c Sat Aug 19 03:38:23 2006 +0000 @@ -247,7 +247,8 @@ else if (type == GAIM_REQUEST_FIELD_CHOICE) { GntWidget *combo = field->ui_data;; - int id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo))); + int id; + id = GPOINTER_TO_INT(gnt_combo_box_get_selected_data(GNT_COMBO_BOX(combo))); gaim_request_field_choice_set_value(field, id); } else if (type == GAIM_REQUEST_FIELD_LIST) diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntrequest.h --- a/console/gntrequest.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntrequest.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,8 +1,12 @@ +#ifndef _GNT_REQUEST_H +#define _GNT_REQUEST_H + #include "request.h" -GaimRequestUiOps *gg_request_get_ui_ops(); +GaimRequestUiOps *gg_request_get_ui_ops(void); + +void gg_request_init(void); -void gg_request_init(); +void gg_request_uninit(void); -void gg_request_uninit(); - +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntstatus.h --- a/console/gntstatus.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntstatus.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,7 +1,11 @@ +#ifndef _GNT_STATUS_H +#define _GNT_STATUS_H + #include #include -void gg_savedstatus_show_all(); +void gg_savedstatus_show_all(void); void gg_savedstatus_edit(GaimSavedStatus *saved); +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/gntui.h --- a/console/gntui.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/gntui.h Sat Aug 19 03:38:23 2006 +0000 @@ -1,3 +1,8 @@ +#ifndef _GNT_UI_H +#define _GNT_UI_H + #include "gnt.h" -void init_gnt_ui(); +void init_gnt_ui(void); + +#endif diff -r f1270dc1d9d2 -r c65ed4f6eea8 console/libgnt/gntwidget.h --- a/console/libgnt/gntwidget.h Sat Aug 19 02:57:06 2006 +0000 +++ b/console/libgnt/gntwidget.h Sat Aug 19 03:38:23 2006 +0000 @@ -23,8 +23,6 @@ typedef struct _GnWidgetPriv GntWidgetPriv; typedef struct _GnWidgetClass GntWidgetClass; -#define N_(X) X - typedef enum _GnWidgetFlags { GNT_WIDGET_DESTROYING = 1 << 0,