adium-1.4 3074:8054154df20a: Resolved some warnings by adding `N...
commits at adium.im
commits at adium.im
Mon Oct 11 16:26:49 UTC 2010
details: http://hg.adium.im/adium-1.4/rev/8054154df20a
revision: 3074:8054154df20a
author: Evan Schoenberg
date: Mon Oct 11 11:26:43 2010 -0500
Resolved some warnings by adding `NULL`s for the fields we're not using in these libpurple structs
diffs (242 lines):
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleAccounts.m
--- a/Plugins/Purple Service/adiumPurpleAccounts.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleAccounts.m Mon Oct 11 11:26:43 2010 -0500
@@ -84,7 +84,11 @@
&adiumPurpleAccountStatusChanged,
&adiumPurpleAccountRequestAdd,
&adiumPurpleAccountRequestAuthorize,
- &adiumPurpleAccountRequestClose
+ &adiumPurpleAccountRequestClose,
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
};
PurpleAccountUiOps *adium_purple_accounts_get_ui_ops(void)
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleBlist.m
--- a/Plugins/Purple Service/adiumPurpleBlist.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleBlist.m Mon Oct 11 11:26:43 2010 -0500
@@ -77,13 +77,18 @@
adiumPurpleBlistNewList,
adiumPurpleBlistNewNode,
adiumPurpleBlistShow,
- NULL,
+ NULL, /* void (*update)(PurpleBuddyList *list, PurpleBlistNode *node); */
+
adiumPurpleBlistRemove,
adiumPurpleBlistDestroy,
adiumPurpleBlistSetVisible,
adiumPurpleBlistRequestAddBuddy,
adiumPurpleBlistRequestAddChat,
- adiumPurpleBlistRequestAddGroup
+ adiumPurpleBlistRequestAddGroup,
+ NULL, /* void (*save_node)(PurpleBlistNode *node) - could suppress blist.xml activity? */
+ NULL, /* void (*remove_node)(PurpleBlistNode *node) */
+ NULL, /* void (*save_account)(PurpleAccount *account) - could suppress accounts.xml activity? */
+ NULL /* void (*_purple_reserved1)(void) */
};
PurpleBlistUiOps *adium_purple_blist_get_ui_ops(void)
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleConnection.m
--- a/Plugins/Purple Service/adiumPurpleConnection.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleConnection.m Mon Oct 11 11:26:43 2010 -0500
@@ -80,7 +80,10 @@
/* report_disconnect */ NULL,
/* network_connected */ NULL,
/* network_disconnected */ NULL,
- adiumPurpleConnReportDisconnectReason
+ adiumPurpleConnReportDisconnectReason,
+ NULL, /* reserved1 */
+ NULL, /* reserved2 */
+ NULL /* reserved3 */
};
PurpleConnectionUiOps *adium_purple_connection_get_ui_ops(void)
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleCore.m
--- a/Plugins/Purple Service/adiumPurpleCore.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleCore.m Mon Oct 11 11:26:43 2010 -0500
@@ -48,7 +48,12 @@
}
static PurpleDebugUiOps adiumPurpleDebugOps = {
- adiumPurpleDebugPrint
+ adiumPurpleDebugPrint,
+ NULL, /* gboolean (*is_enabled)(PurpleDebugLevel level, const char *category) */
+ NULL, /* reserved1 */
+ NULL, /* reserved2 */
+ NULL, /* reserved3 */
+ NULL /* reserved4 */
};
PurpleDebugUiOps *adium_purple_debug_get_ui_ops(void)
@@ -263,7 +268,10 @@
adiumPurpleCoreDebugInit,
adiumPurpleCoreUiInit,
adiumPurpleCoreQuit,
- adiumPurpleCoreGetUiInfo
+ adiumPurpleCoreGetUiInfo,
+ NULL,
+ NULL,
+ NULL
};
PurpleCoreUiOps *adium_purple_core_get_ops(void)
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleDnsRequest.m
--- a/Plugins/Purple Service/adiumPurpleDnsRequest.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleDnsRequest.m Mon Oct 11 11:26:43 2010 -0500
@@ -255,7 +255,11 @@
static PurpleDnsQueryUiOps adiumPurpleDnsRequestOps = {
adiumPurpleDnsRequestResolve,
- adiumPurpleDnsRequestDestroy
+ adiumPurpleDnsRequestDestroy,
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
};
PurpleDnsQueryUiOps *adium_purple_dns_request_get_ui_ops(void)
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleEventloop.m
--- a/Plugins/Purple Service/adiumPurpleEventloop.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleEventloop.m Mon Oct 11 11:26:43 2010 -0500
@@ -436,7 +436,10 @@
adium_input_add,
adium_source_remove,
adium_input_get_error,
- /* timeout_add_seconds */ NULL
+ /* timeout_add_seconds */ NULL,
+ NULL,
+ NULL,
+ NULL
};
PurpleEventLoopUiOps *adium_purple_eventloop_get_ui_ops(void)
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleFt.m
--- a/Plugins/Purple Service/adiumPurpleFt.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleFt.m Mon Oct 11 11:26:43 2010 -0500
@@ -66,7 +66,11 @@
adiumPurpleAddXfer,
adiumPurpleUpdateProgress,
adiumPurpleCancelLocal,
- adiumPurpleCancelRemote
+ adiumPurpleCancelRemote,
+ NULL, /* gssize (*ui_write)(PurpleXfer *xfer, const guchar *buffer, gssize size); */
+ NULL, /* gssize (*ui_read)(PurpleXfer *xfer, guchar **buffer, gssize size); */
+ NULL, /* void (*data_not_sent)(PurpleXfer *xfer, const guchar *buffer, gsize size); */
+ NULL /* reserved1 */
};
PurpleXferUiOps *adium_purple_xfers_get_ui_ops()
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleNotify.m
--- a/Plugins/Purple Service/adiumPurpleNotify.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleNotify.m Mon Oct 11 11:26:43 2010 -0500
@@ -196,7 +196,11 @@
adiumPurpleNotifySearchResultsNewRows,
adiumPurpleNotifyUserinfo,
adiumPurpleNotifyUri,
- adiumPurpleNotifyClose
+ adiumPurpleNotifyClose,
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
};
PurpleNotifyUiOps *adium_purple_notify_get_ui_ops(void)
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurplePrivacy.m
--- a/Plugins/Purple Service/adiumPurplePrivacy.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurplePrivacy.m Mon Oct 11 11:26:43 2010 -0500
@@ -38,7 +38,11 @@
adiumPurplePermitAdded,
adiumPurplePermitRemoved,
adiumPurpleDenyAdded,
- adiumPurpleDenyRemoved
+ adiumPurpleDenyRemoved,
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
};
PurplePrivacyUiOps *adium_purple_privacy_get_ui_ops()
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleRequest.m
--- a/Plugins/Purple Service/adiumPurpleRequest.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleRequest.m Mon Oct 11 11:26:43 2010 -0500
@@ -395,7 +395,11 @@
adiumPurpleRequestFields,
adiumPurpleRequestFile,
adiumPurpleRequestClose,
- adiumPurpleRequestFolder
+ adiumPurpleRequestFolder,
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
};
PurpleRequestUiOps *adium_purple_request_get_ui_ops()
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/adiumPurpleRoomlist.m
--- a/Plugins/Purple Service/adiumPurpleRoomlist.m Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/adiumPurpleRoomlist.m Mon Oct 11 11:26:43 2010 -0500
@@ -43,7 +43,11 @@
adiumPurpleRoomlistSetFields,
adiumPurpleRoomlistAddRoom,
adiumPurpleRoomlistInProgress,
- adiumPurpleRoomlistDestroy
+ adiumPurpleRoomlistDestroy,
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
};
PurpleRoomlistUiOps *adium_purple_roomlist_get_ui_ops()
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-cdsa.c Mon Oct 11 11:26:43 2010 -0500
@@ -607,9 +607,9 @@
N_("CDSA"), /* name */
"0.1", /* version */
+ N_("Provides SSL support through CDSA."), /* summary */
N_("Provides SSL support through CDSA."), /* description */
- N_("Provides SSL support through CDSA."),
- "CDSA",
+ "CDSA", /* author */
"http://www.opengroup.org/security/l2-cdsa.htm", /* homepage */
plugin_load, /* load */
@@ -619,7 +619,12 @@
NULL, /* ui_info */
NULL, /* extra_info */
NULL, /* prefs_info */
- NULL /* actions */
+ NULL, /* actions */
+
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
};
static void
diff -r ca0f5c1a8856 -r 8054154df20a Plugins/Purple Service/libpurple_extensions/ssl-openssl.c
--- a/Plugins/Purple Service/libpurple_extensions/ssl-openssl.c Mon Oct 11 11:24:25 2010 -0500
+++ b/Plugins/Purple Service/libpurple_extensions/ssl-openssl.c Mon Oct 11 11:26:43 2010 -0500
@@ -357,7 +357,13 @@
NULL, /* ui_info */
NULL, /* extra_info */
NULL, /* prefs_info */
- NULL /* actions */
+ NULL, /* actions */
+
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL, /* reserved */
+ NULL /* reserved */
+
};
static void
More information about the commits
mailing list