[easytag/wip/musicbrainz-support-merge: 3/9] Added more ifdef to fix "missing action MBSearch" warning



commit 0ff41089e378524ef30af1433797d35f5aaf2488
Author: Abhinav <abhijangda hotmail com>
Date:   Tue Aug 12 13:59:36 2014 +0530

    Added more ifdef to fix "missing action MBSearch" warning

 src/bar.c        |    3 +++
 src/bar.h        |    6 ++++++
 src/ui_manager.h |    9 ++++++++-
 3 files changed, 17 insertions(+), 1 deletions(-)
---
diff --git a/src/bar.c b/src/bar.c
index a8030e5..efe7739 100644
--- a/src/bar.c
+++ b/src/bar.c
@@ -331,7 +331,10 @@ void Create_UI (GtkWidget **ppmenubar, GtkWidget **pptoolbar)
         { POPUP_DIR_RUN_AUDIO,          GTK_STOCK_MEDIA_PLAY,   _("Run Audio Player"),          NULL, _("Run 
audio player"),        G_CALLBACK(Run_Audio_Player_Using_Directory) },
         { AM_ARTIST_RUN_AUDIO_PLAYER,   GTK_STOCK_MEDIA_PLAY,   _("Run Audio Player"),          NULL, _("Run 
audio player"),        G_CALLBACK(Run_Audio_Player_Using_Browser_Artist_List) },
         { AM_ALBUM_RUN_AUDIO_PLAYER,    GTK_STOCK_MEDIA_PLAY,   _("Run Audio Player"),          NULL, _("Run 
audio player"),        G_CALLBACK(Run_Audio_Player_Using_Browser_Album_List)  },
+
+#ifdef ENABLE_libmusicbrainz
         { AM_MB_SEARCH_FILE,          GTK_STOCK_CDROM,   _("MusicBrainz Search Files…"),    NULL, 
_("MusicBrainz search files…"),  G_CALLBACK(Cddb_Popup_Menu_Search_Selected_File) },
+#endif /* libmusicbrainz */
         //{ AM_ARTIST_OPEN_FILE_WITH,     GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open 
File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? 
Browser_Open_Run_Program_Tree_Window???) },
         //{ AM_ALBUM_OPEN_FILE_WITH,      GTK_STOCK_OPEN,    _("Open File(s) with…"),     NULL, _("Open 
File(s) with…"),     G_CALLBACK(Browser_Open_Run_Program_List_Window??? 
Browser_Open_Run_Program_Tree_Window???) },
 
diff --git a/src/bar.h b/src/bar.h
index cbfca35..ad68ae4 100644
--- a/src/bar.h
+++ b/src/bar.h
@@ -22,6 +22,8 @@
 #ifndef __BAR_H__
 #define __BAR_H__
 
+#include <config.h>
+
 /***************
  * Declaration *
  ***************/
@@ -94,8 +96,12 @@ GtkWidget *CheckMenuItemBrowseHiddenDirMainMenu;
 #define AM_SCANNER_PROCESS_FIELDS   "ProcessFields"
 #define AM_SCANNER_SHOW "ShowScanner"
 #define AM_SEARCH_FILE              "SearchFile"
+
+#ifdef ENABLE_libmusicbrainz
 #define AM_MB_SEARCH_FILE           "MBSearchFile"
 #define AM_MB_SEARCH                "MBSearch"
+#endif /* ENABLE_libmusicbrainz */
+
 #define AM_FILENAME_FROM_TXT        "LoadFilenames"
 #define AM_WRITE_PLAYLIST           "WritePlaylist"
 #define AM_RUN_AUDIO_PLAYER         "RunAudio"
diff --git a/src/ui_manager.h b/src/ui_manager.h
index a976ffe..3805bb5 100644
--- a/src/ui_manager.h
+++ b/src/ui_manager.h
@@ -153,9 +153,10 @@ static const gchar *ui_xml =
 "    </menu>"
 
 "    <menu action='MiscMenu'>"
+#ifdef ENABLE_libmusicbrainz
 "      <menuitem action='MBSearch' />"
 "      <separator />"
-
+#endif /* ENABLE_libmusicbrainz */
 "      <menuitem action='LoadFilenames' />"
 "      <menuitem action='WritePlaylist' />"
 "    </menu>"
@@ -211,7 +212,9 @@ static const gchar *ui_xml =
 "    <separator />"
 
 "    <toolitem action='SearchFile' />"
+#ifdef ENABLE_libmusicbrainz
 "    <toolitem action='MBSearch' />"
+#endif /* ENABLE_libmusicbrainz */
 "    <toolitem action='WritePlaylist' />"
 "    <separator />"
 
@@ -233,7 +236,11 @@ static const gchar *ui_xml =
 "    <menu action='ScannerSubpopup'>"
 "      <menuitem action='ShowScanner' />"
 "    </menu>"
+
+#ifdef ENABLE_libmusicbrainz
 "    <menuitem action='MBSearchFile' />"
+#endif /* ENABLE_libmusicbrainz */
+
 "    <menuitem action='SearchFile' />"
 "    <menuitem action='DeleteFile' />"
 "    <menuitem action='ReloadDir' />"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]