Rename BrowserIntegrateSearch in IntegrateSearch as integrated search does not requir...

diff --git a/src/browsers/playlist3-current-playlist-browser.c b/src/browsers/playlist3-current-playlist-browser.c
index be8e7e0..69e4421 100644 (file)
--- a/src/browsers/playlist3-current-playlist-browser.c
+++ b/src/browsers/playlist3-current-playlist-browser.c
@@ -1240,13 +1240,13 @@ static void play_queue_plugin_tool_menu_iface_init (GmpcPluginToolMenuIfaceIface
        iface->tool_menu_integration = pl3_current_playlist_tool_menu_integration;
 }
 /* Integrate Search */
-static gboolean play_queue_plugin_is_field_supported(GmpcPluginBrowserIntegrateSearchIface *obj, int tag)
+static gboolean play_queue_plugin_is_field_supported(GmpcPluginIntegrateSearchIface *obj, int tag)
 {
     if(tag == MPD_TAG_NUM_OF_ITEM_TYPES) return TRUE; 
     return mpd_server_tag_supported(connection, tag);
 }
 
-static MpdData * play_queue_plugin_is_search(GmpcPluginBrowserIntegrateSearchIface *obj, int num_field , gchar *search_string)
+static MpdData * play_queue_plugin_is_search(GmpcPluginIntegrateSearchIface *obj, int num_field , gchar *search_string)
 {
     MpdData *data_t = NULL;
     if(num_field == MPD_TAG_NUM_OF_ITEM_TYPES){
@@ -1271,7 +1271,7 @@ static MpdData * play_queue_plugin_is_search(GmpcPluginBrowserIntegrateSearchIfa
     return data_t;
 }
 
-static void play_queue_plugin_is_iface_init (GmpcPluginBrowserIntegrateSearchIfaceIface * iface) {
+static void play_queue_plugin_is_iface_init (GmpcPluginIntegrateSearchIfaceIface * iface) {
     iface->field_supported = play_queue_plugin_is_field_supported;
     iface->search = play_queue_plugin_is_search;
 }
@@ -1299,7 +1299,7 @@ GType play_queue_plugin_get_type(void) {
 
                g_type_add_interface_static (play_queue_plugin_type_id, GMPC_PLUGIN_TYPE_BROWSER_IFACE, &iface_info);
                g_type_add_interface_static (play_queue_plugin_type_id, GMPC_PLUGIN_TYPE_TOOL_MENU_IFACE, &iface_tm_info);
-               g_type_add_interface_static (play_queue_plugin_type_id, GMPC_PLUGIN_TYPE_BROWSER_INTEGRATE_SEARCH_IFACE, &iface_is_info);
+               g_type_add_interface_static (play_queue_plugin_type_id, GMPC_PLUGIN_TYPE_INTEGRATE_SEARCH_IFACE, &iface_is_info);
        }
        return play_queue_plugin_type_id;
 }

diff --git a/src/plugin.c b/src/plugin.c
index ccc31df..7142d7e 100644 (file)
--- a/src/plugin.c
+++ b/src/plugin.c
@@ -594,7 +594,7 @@ int gmpc_plugin_browser_song_list_option_menu(gmpcPluginParent *plug, GmpcMpdDat
 gboolean gmpc_plugin_browser_has_integrate_search(gmpcPluginParent *plug)
 {
     if(plug->new){
-        return GMPC_PLUGIN_IS_BROWSER_INTEGRATE_SEARCH_IFACE(plug->new);
+        return GMPC_PLUGIN_IS_INTEGRATE_SEARCH_IFACE(plug->new);
     }
     if(gmpc_plugin_is_browser(plug))
     {
@@ -605,7 +605,7 @@ gboolean gmpc_plugin_browser_has_integrate_search(gmpcPluginParent *plug)
 MpdData *gmpc_plugin_browser_integrate_search(gmpcPluginParent *plug, const int search_field, const gchar * query, GError **error)
 {
     if(!gmpc_plugin_browser_has_integrate_search(plug)) return NULL;
-    if(plug->new) return gmpc_plugin_browser_integrate_search_iface_search(GMPC_PLUGIN_BROWSER_INTEGRATE_SEARCH_IFACE(plug->new), search_field, query);
+    if(plug->new) return gmpc_plugin_integrate_search_iface_search(GMPC_PLUGIN_INTEGRATE_SEARCH_IFACE(plug->new), search_field, query);
     return plug->old->browser->integrate_search(search_field,query,error); 
 }
 
@@ -613,7 +613,7 @@ gboolean gmpc_plugin_browser_integrate_search_field_supported(gmpcPluginParent *
 {
     if(!gmpc_plugin_browser_has_integrate_search(plug)) return FALSE;
     
-    if(plug->new) return gmpc_plugin_browser_integrate_search_iface_field_supported(GMPC_PLUGIN_BROWSER_INTEGRATE_SEARCH_IFACE(plug->new), search_field);
+    if(plug->new) return gmpc_plugin_integrate_search_iface_field_supported(GMPC_PLUGIN_INTEGRATE_SEARCH_IFACE(plug->new), search_field);
 
        if(plug->old->browser->integrate_search_field_supported == NULL) return TRUE;
     return plug->old->browser->integrate_search_field_supported(search_field); 

diff --git a/src/vala/gmpc-plugin.vala b/src/vala/gmpc-plugin.vala
index 2b7d7d9..33144f5 100644 (file)
--- a/src/vala/gmpc-plugin.vala
+++ b/src/vala/gmpc-plugin.vala
@@ -127,7 +127,7 @@ namespace Gmpc {
             }
 
         }
-        public interface BrowserIntegrateSearchIface : Base {
+        public interface IntegrateSearchIface : Base {
             public virtual bool field_supported (MPD.Tag.Type tag)
             {
                 return true;