Menu
▾
▴
[Gaim-commits] SF.net SVN: gaim: [16870] trunk/console
|
From: <sa...@us...> - 2006-08-19 03:38:35
|
Revision: 16870 Author: sadrul Date: 2006-08-18 20:38:23 -0700 (Fri, 18 Aug 2006) ViewCVS: http://svn.sourceforge.net/gaim/?rev=16870&view=rev Log Message: ----------- Do the right thing: remove the compile warnings. Modified Paths: -------------- trunk/console/gntaccount.h trunk/console/gntblist.c trunk/console/gntblist.h trunk/console/gntconn.h trunk/console/gntconv.h trunk/console/gntdebug.h trunk/console/gntgaim.c trunk/console/gntgaim.h trunk/console/gntnotify.c trunk/console/gntnotify.h trunk/console/gntplugin.h trunk/console/gntprefs.c trunk/console/gntprefs.h trunk/console/gntrequest.c trunk/console/gntrequest.h trunk/console/gntstatus.h trunk/console/gntui.h trunk/console/libgnt/gntwidget.h Modified: trunk/console/gntaccount.h =================================================================== --- trunk/console/gntaccount.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntaccount.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 Modified: trunk/console/gntblist.c =================================================================== --- trunk/console/gntblist.c 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntblist.c 2006-08-19 03:38:23 UTC (rev 16870) @@ -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); Modified: trunk/console/gntblist.h =================================================================== --- trunk/console/gntblist.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntblist.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 Modified: trunk/console/gntconn.h =================================================================== --- trunk/console/gntconn.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntconn.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 gg_connections_init(void); -void gg_connections_uninit(); +void gg_connections_uninit(void); +#endif Modified: trunk/console/gntconv.h =================================================================== --- trunk/console/gntconv.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntconv.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 gg_conversation_init(void); -void gg_conversation_uninit(); +void gg_conversation_uninit(void); + +#endif Modified: trunk/console/gntdebug.h =================================================================== --- trunk/console/gntdebug.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntdebug.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 Modified: trunk/console/gntgaim.c =================================================================== --- trunk/console/gntgaim.c 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntgaim.c 2006-08-19 03:38:23 UTC (rev 16870) @@ -129,7 +129,7 @@ (guint (*)(guint))g_source_remove }; -GaimEventLoopUiOps * +static GaimEventLoopUiOps * gnt_eventloop_get_ui_ops(void) { return &eventloop_ops; Modified: trunk/console/gntgaim.h =================================================================== --- trunk/console/gntgaim.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntgaim.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -1,6 +1,6 @@ #include <glib.h> -#include <libintl.h> +#include "libgaim/internal.h" + #define GAIM_GNT_UI "gnt-gaim" -#define _(x) x Modified: trunk/console/gntnotify.c =================================================================== --- trunk/console/gntnotify.c 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntnotify.c 2006-08-19 03:38:23 UTC (rev 16870) @@ -293,6 +293,8 @@ case GAIM_NOTIFY_BUTTON_INVITE: text = _("Invite"); break; + default: + text = _("(none)"); } button = gnt_button_new(text); Modified: trunk/console/gntnotify.h =================================================================== --- trunk/console/gntnotify.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntnotify.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 gg_notify_init(void); -void gg_notify_uninit(); +void gg_notify_uninit(void); +#endif + Modified: trunk/console/gntplugin.h =================================================================== --- trunk/console/gntplugin.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntplugin.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -1,3 +1,6 @@ +#ifndef _GNT_PLUGIN_H +#define _GNT_PLUGIN_H + #include <gnt.h> #include <plugin.h> @@ -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 Modified: trunk/console/gntprefs.c =================================================================== --- trunk/console/gntprefs.c 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntprefs.c 2006-08-19 03:38:23 UTC (rev 16870) @@ -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}, }; Modified: trunk/console/gntprefs.h =================================================================== --- trunk/console/gntprefs.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntprefs.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 Modified: trunk/console/gntrequest.c =================================================================== --- trunk/console/gntrequest.c 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntrequest.c 2006-08-19 03:38:23 UTC (rev 16870) @@ -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) Modified: trunk/console/gntrequest.h =================================================================== --- trunk/console/gntrequest.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntrequest.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 gg_request_init(void); -void gg_request_uninit(); +void gg_request_uninit(void); +#endif Modified: trunk/console/gntstatus.h =================================================================== --- trunk/console/gntstatus.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntstatus.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -1,7 +1,11 @@ +#ifndef _GNT_STATUS_H +#define _GNT_STATUS_H + #include <status.h> #include <savedstatuses.h> -void gg_savedstatus_show_all(); +void gg_savedstatus_show_all(void); void gg_savedstatus_edit(GaimSavedStatus *saved); +#endif Modified: trunk/console/gntui.h =================================================================== --- trunk/console/gntui.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/gntui.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -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 Modified: trunk/console/libgnt/gntwidget.h =================================================================== --- trunk/console/libgnt/gntwidget.h 2006-08-19 02:57:06 UTC (rev 16869) +++ trunk/console/libgnt/gntwidget.h 2006-08-19 03:38:23 UTC (rev 16870) @@ -23,8 +23,6 @@ typedef struct _GnWidgetPriv GntWidgetPriv; typedef struct _GnWidgetClass GntWidgetClass; -#define N_(X) X - typedef enum _GnWidgetFlags { GNT_WIDGET_DESTROYING = 1 << 0, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
