[geany/geany-plugins] a6f9ce: autoclose: Rename signal handlers to better fit the signals they're connected to.

[Thomas Martitz]

Branch:      refs/heads/master
Author:      Thomas Martitz <thomas.martitz at student.htw-berlin.de>
Committer:   Thomas Martitz <thomas.martitz at student.htw-berlin.de>
Date:        Wed, 23 Oct 2013 18:49:01 UTC
Commit:      a6f9ce24c4c91d8200321f17871fc4298a0c65d5
             https://github.com/geany/geany-plugins/commit/a6f9ce24c4c91d8200321f17871fc4298a0c65d5

Log Message:
-----------
autoclose: Rename signal handlers to better fit the signals they're connected to.


Modified Paths:
--------------
    autoclose/src/autoclose.c

Modified: autoclose/src/autoclose.c
14 files changed, 7 insertions(+), 7 deletions(-)
===================================================================
@@ -768,7 +768,7 @@ struct_semicolon(
 }
 
 static void
-on_editor_notify(GObject *obj, gint scn, SCNotification *nt, gpointer user_data)
+on_sci_notify(GObject *obj, gint scn, SCNotification *nt, gpointer user_data)
 {
 	AutocloseUserData *data = user_data;
 
@@ -799,7 +799,7 @@ struct_semicolon(
 #define AC_GOBJECT_KEY "autoclose-userdata"
 
 static void
-on_document_activate(GObject *obj, GeanyDocument *doc, gpointer user_data)
+on_document_open(GObject *obj, GeanyDocument *doc, gpointer user_data)
 {
 	AutocloseUserData *data;
 	ScintillaObject   *sci;
@@ -809,7 +809,7 @@ struct_semicolon(
 	data = g_new0(AutocloseUserData, 1);
 	data->doc = doc;
 	plugin_signal_connect(geany_plugin, G_OBJECT(sci), "sci-notify",
-		FALSE, G_CALLBACK(on_editor_notify), data);
+		FALSE, G_CALLBACK(on_sci_notify), data);
 	plugin_signal_connect(geany_plugin, G_OBJECT(sci), "key-press-event",
 			FALSE, G_CALLBACK(on_key_press), data);
 	/* save data pointer via GObject too for on_document_close() */
@@ -823,14 +823,14 @@ struct_semicolon(
 	ScintillaObject   *sci = doc->editor->sci;
 	AutocloseUserData *data = g_object_steal_data(G_OBJECT(sci), AC_GOBJECT_KEY);
 	/* no plugin_signal_disconnect() ?? */
-	g_signal_handlers_disconnect_by_func(G_OBJECT(sci), G_CALLBACK(on_editor_notify), data);
+	g_signal_handlers_disconnect_by_func(G_OBJECT(sci), G_CALLBACK(on_sci_notify), data);
 	g_free(data);
 }
 
 PluginCallback plugin_callbacks[] =
 {
-	{ "document-open",  (GCallback) &on_document_activate, FALSE, NULL },
-	{ "document-new",   (GCallback) &on_document_activate, FALSE, NULL },
+	{ "document-open",  (GCallback) &on_document_open, FALSE, NULL },
+	{ "document-new",   (GCallback) &on_document_open, FALSE, NULL },
 	{ "document-close", (GCallback) &on_document_close,    FALSE, NULL },
 	{ NULL, NULL, FALSE, NULL }
 };
@@ -899,7 +899,7 @@ struct_semicolon(
 	int i;
 	foreach_document(i)
 	{
-		on_document_activate(NULL, documents[i], NULL);
+		on_document_open(NULL, documents[i], NULL);
 	}
 	GKeyFile *config = g_key_file_new();
 



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