2011-09-11 [mir] 0.6.0cvs12

	* plugins/xml/xml-plugin.c
	* src/plugin-loader.c
	* src/plugin-loader.h
	* src/plugin.h
	    Fix typo.

diff --git a/ChangeLog b/ChangeLog
index ed26ea95c2bda9c0a95330a0716ef7db7ea72474..f9cf06484e480097134dc21bc8525095c547d04e 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-09-11 [mir]       0.6.0cvs12
+
+       * plugins/xml/xml-plugin.c
+       * src/plugin-loader.c
+       * src/plugin-loader.h
+       * src/plugin.h
+           Fix typo.
+
 2011-09-11 [mir]       0.6.0cvs11
 
        * plugins/example/example-plugin.c

diff --git a/PATCHSETS b/PATCHSETS
index 16ca8eb741a0db4e9d76431391bd7503473992bb..05dc85d0a0edf3a2ab3616d8d86d9b364bd4265a 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -9,3 +9,4 @@
 ( cvs diff -u -r 1.1 -r 1.2 src/callbacks.c;  cvs diff -u -r 1.1 -r 1.2 src/mainwindow.c;  ) > 0.6.0cvs9.patchset
 ( cvs diff -u -r 1.1 -r 1.2 src/plugin-loader.c;  ) > 0.6.0cvs10.patchset
 ( cvs diff -u -r 1.1 -r 1.2 plugins/example/example-plugin.c;  ) > 0.6.0cvs11.patchset
+( cvs diff -u -r 1.1 -r 1.2 plugins/xml/xml-plugin.c;  cvs diff -u -r 1.2 -r 1.3 src/plugin-loader.c;  cvs diff -u -r 1.1 -r 1.2 src/plugin-loader.h;  cvs diff -u -r 1.1 -r 1.2 src/plugin.h;  ) > 0.6.0cvs12.patchset

diff --git a/configure.ac b/configure.ac
index ad11285377d505cb16254d52619bd6474145e0db..7bf37151cb0330661f23fe15d5919609edd355ca 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=6
 MICRO_VERSION=0
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=11
+EXTRA_VERSION=12
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/plugins/xml/xml-plugin.c b/plugins/xml/xml-plugin.c
index 556b926dafa8c978df557a4a26380b507e541143..c85df802eef0fd9e7c42315283f756f8e39b0745 100644 (file)
--- a/plugins/xml/xml-plugin.c
+++ b/plugins/xml/xml-plugin.c
@@ -817,7 +817,7 @@ const gchar* plugin_type(void) {
        return "xml";
 }
 
-const gchar* plugin_licence(void) {
+const gchar* plugin_license(void) {
        return "GPL3+";
 }
 

diff --git a/src/plugin-loader.c b/src/plugin-loader.c
index 56ee170673da5e72f41260dd382146c63cfb0a4b..f600b98fc67d12c58cc08e7a7362daf15e3914ef 100644 (file)
--- a/src/plugin-loader.c
+++ b/src/plugin-loader.c
@@ -99,8 +99,8 @@ static const gchar* plugin_get_version(Plugin* plugin) {
        return plugin->version();
 }
 
-static const gchar* plugin_get_licence(Plugin* plugin) {
-       return plugin->licence();
+static const gchar* plugin_get_license(Plugin* plugin) {
+       return plugin->license();
 }
 
 /*static const gchar* plugin_get_addrbook_name(Plugin* plugin) {
@@ -269,7 +269,7 @@ static void select_row_cb(Plugin *plugin, PluginWindow *pluginwindow) {
        if (pluginwindow->selected_plugin != NULL) {
                const gchar* desc = plugin_get_desc(plugin);
                const gchar* err = plugin_get_error(plugin);
-               const gchar* licence = plugin_get_licence(plugin);
+               const gchar* license = plugin_get_license(plugin);
                gtk_text_buffer_get_start_iter(textbuf, &start_iter);
                gtk_text_buffer_get_end_iter(textbuf, &end_iter);
                gtk_text_buffer_delete(textbuf, &start_iter, &end_iter);
@@ -277,13 +277,13 @@ static void select_row_cb(Plugin *plugin, PluginWindow *pluginwindow) {
                if (err == NULL)
                        text = g_strconcat(desc, _("\n\nVersion: "),
                                   plugin_get_version(plugin),
-                                  _("\nLicense: "), licence, "\n", NULL);
+                                  _("\nLicense: "), license, "\n", NULL);
                else
                        text = g_strconcat(_("Error: "),
                                   err, "\n", _("Plugin is not functional."), 
                                   "\n\n", desc, _("\n\nVersion: "),
                                   plugin_get_version(plugin),
-                                  _("\nLicense: "), licence, "\n", NULL);
+                                  _("\nLicense: "), license, "\n", NULL);
                gtk_text_buffer_insert(textbuf, &start_iter, text, strlen(text));
                g_free(text);
                gtk_widget_set_sensitive(pluginwindow->unload_btn, TRUE);
@@ -611,7 +611,7 @@ void plugin_dialog(MainWindow* mainwindow) {
 Plugin* plugin_load(const gchar* filename, gchar** error) {
        Plugin* plugin;
        gpointer plugin_init, plugin_reset, plugin_name, plugin_provides,
-                        plugin_desc, plugin_version, plugin_licence, plugin_attrib_list,
+                        plugin_desc, plugin_version, plugin_license, plugin_attrib_list,
                         get_contact, set_contact, delete_contact, search_contact, update_contact,
                         plugin_abook_open, plugin_abook_close, plugin_abook_delete,
                         plugin_addrbook_all_get, plugin_abook_set_config, plugin_type,
@@ -637,7 +637,7 @@ Plugin* plugin_load(const gchar* filename, gchar** error) {
                !g_module_symbol(plugin->module, "plugin_type", &plugin_type) ||
                !g_module_symbol(plugin->module, "plugin_version", &plugin_version) ||
                !g_module_symbol(plugin->module, "plugin_provides", &plugin_provides) ||
-               !g_module_symbol(plugin->module, "plugin_licence", &plugin_licence) ||
+               !g_module_symbol(plugin->module, "plugin_license", &plugin_license) ||
                !g_module_symbol(plugin->module, "plugin_attrib_list", &plugin_attrib_list) ||
                !g_module_symbol(plugin->module, "plugin_attribs_set", &plugin_attribs_set) ||
                !g_module_symbol(plugin->module, "plugin_addrbook_all_get", &plugin_addrbook_all_get) ||
@@ -707,7 +707,7 @@ Plugin* plugin_load(const gchar* filename, gchar** error) {
        plugin->desc = plugin_desc;
        plugin->version = plugin_version;
        plugin->type = plugin_type;
-       plugin->licence = plugin_licence;
+       plugin->license = plugin_license;
        plugin->filename = g_strdup(filename);
        plugin->error = NULL;
        plugin->abook_open = plugin_abook_open;

diff --git a/src/plugin-loader.h b/src/plugin-loader.h
index a8d5b5fce925dbdeca16df3790daa22964479648..fd48a7841e2fff877fb9824d73060b46673e9fee 100644 (file)
--- a/src/plugin-loader.h
+++ b/src/plugin-loader.h
@@ -52,7 +52,7 @@ typedef struct {
        const gchar* (*desc) (void);
        const gchar* (*version) (void);
        const gchar* (*type) (void);
-       const gchar* (*licence) (void);
+       const gchar* (*license) (void);
        const gchar* (*filter) (void);
        gchar* (*default_url) (const gchar* name);
        PluginFeature* (*provides) (void);

diff --git a/src/plugin.h b/src/plugin.h
index 8def950ddaed7efa688305d9a0eb2ba5be3fa318..99cdb8cb242d2993ff7645b6e14bb0414cb66cec 100644 (file)
--- a/src/plugin.h
+++ b/src/plugin.h
@@ -113,7 +113,7 @@ const gchar* plugin_name(void);
 const gchar* plugin_desc(void);
 const gchar* plugin_version(void);
 const gchar* plugin_type(void);
-const gchar* plugin_licence(void);
+const gchar* plugin_license(void);
 gchar* plugin_default_url(const gchar* name);
 gboolean plugin_abook_open(AddressBook* abook, gchar** error);
 gboolean plugin_abook_close(AddressBook* abook, gchar** error);