[geany/geany] 43b798: Merge pull request #1350 from kugel-/for-upstream

[Colomban Wendling]

Branch:      refs/heads/master
Author:      Colomban Wendling <ban at herbesfolles.org>
Committer:   Colomban Wendling <ban at herbesfolles.org>
Date:        Mon, 09 Jan 2017 13:18:16 UTC
Commit:      43b7982b2efe48c858e902a14cf33ef57d428ec9
             https://github.com/geany/geany/commit/43b7982b2efe48c858e902a14cf33ef57d428ec9

Log Message:
-----------
Merge pull request #1350 from kugel-/for-upstream

api: rework GeanyProxyProbeResults compat symbols as defines


Modified Paths:
--------------
    src/plugindata.h

Modified: src/plugindata.h
30 lines changed, 15 insertions(+), 15 deletions(-)
===================================================================
@@ -345,29 +345,17 @@ void geany_plugin_set_data(GeanyPlugin *plugin, gpointer data, GDestroyNotify fr
  */
 typedef enum
 {
-	/** @deprecated Use GEANY_PROXY_IGNORE instead.
-	 * @since 1.26 (API 226)
-	 */
-	PROXY_IGNORED,
-	/** @deprecated Use GEANY_PROXY_MATCH instead.
-	 * @since 1.26 (API 226)
-	 */
-	PROXY_MATCHED,
-	/** @deprecated Use GEANY_PROXY_RELATED instead.
-	 * @since 1.26 (API 226)
-	 */
-	PROXY_NOLOAD = 0x100,
 	/** The proxy is not responsible at all, and Geany or other plugins are free
 	 * to probe it.
 	 *
 	 * @since 1.29 (API 229)
 	 **/
-	GEANY_PROXY_IGNORE = PROXY_IGNORED,
+	GEANY_PROXY_IGNORE,
 	/** The proxy is responsible for this file, and creates a plugin for it.
 	 *
 	 * @since 1.29 (API 229)
 	 */
-	GEANY_PROXY_MATCH = PROXY_MATCHED,
+	GEANY_PROXY_MATCH,
 	/** The proxy is does not directly load it, but it's still tied to the proxy.
 	 *
 	 * This is for plugins that come in multiple files where only one of these
@@ -378,10 +366,22 @@ typedef enum
 	 *
 	 * @since 1.29 (API 229)
 	 */
-	GEANY_PROXY_RELATED = PROXY_MATCHED | PROXY_NOLOAD
+	GEANY_PROXY_RELATED = GEANY_PROXY_MATCH | 0x100
 }
 GeanyProxyProbeResults;
 
+/** @deprecated Use GEANY_PROXY_IGNORE instead.
+ * @since 1.26 (API 226)
+ */
+#define PROXY_IGNORED GEANY_PROXY_IGNORE
+/** @deprecated Use GEANY_PROXY_MATCH instead.
+ * @since 1.26 (API 226)
+ */
+#define PROXY_MATCHED GEANY_PROXY_MATCH
+/** @deprecated Use GEANY_PROXY_RELATED instead.
+ * @since 1.26 (API 226)
+ */
+#define PROXY_NOLOAD 0x100
 
 /** Hooks that need to be implemented by every proxy
  *



--------------
This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).