GNOME.org
 

[easytag/wip/musicbrainz-support-merge: 29/55] Bug Fixed: Pressing Close when searching will give error

commit 92dc262fd51fe32dd0ec7ce575cfc59fb59028f7
Author: Abhinav <abhijangda hotmail com>
Date:   Sun Aug 10 18:02:05 2014 +0530

    Bug Fixed: Pressing Close when searching will give error

 po/bg.po                 |    2 +-
 po/da.po                 |    2 +-
 po/he.po                 |    2 +-
 po/ja.po                 |    2 +-
 po/nl.po                 |    2 +-
 po/ro.po                 |    2 +-
 po/sv.po                 |    2 +-
 po/te.po                 |    2 +-
 po/uk.po                 |    2 +-
 po/zh_CN.po              |    2 +-
 po/zh_TW.po              |    2 +-
 src/mb_search.h          |    4 ++--
 src/musicbrainz_dialog.c |   23 ++++++++++++++---------
 13 files changed, 27 insertions(+), 22 deletions(-)
---
diff --git a/po/bg.po b/po/bg.po
index ee99c69..57c20e2 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -26,7 +26,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/da.po b/po/da.po
index 35790e5..327c279 100644
--- a/po/da.po
+++ b/po/da.po
@@ -30,7 +30,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/he.po b/po/he.po
index 178d604..fbb9f14 100644
--- a/po/he.po
+++ b/po/he.po
@@ -27,7 +27,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/ja.po b/po/ja.po
index 4ca7138..c9411cc 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -26,7 +26,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/nl.po b/po/nl.po
index f8b66d1..13dfc42 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -29,7 +29,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/ro.po b/po/ro.po
index 4034041..1cf448f 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -28,7 +28,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/sv.po b/po/sv.po
index d5f10b2..1428091 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -29,7 +29,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/te.po b/po/te.po
index 3dd299f..27993dd 100644
--- a/po/te.po
+++ b/po/te.po
@@ -48,7 +48,7 @@ msgstr ""
 
 #. Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list 
MUST also end with a semicolon!
 #: ../data/easytag.desktop.in.h:4
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:89
diff --git a/po/uk.po b/po/uk.po
index cc2a9ce..7e11ae3 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -28,7 +28,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/zh_CN.po b/po/zh_CN.po
index f991dfe..67686ec 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -29,7 +29,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 7b6b32d..baecc02 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -28,7 +28,7 @@ msgid "Edit sound file metadata"
 msgstr ""
 
 #: ../easytag.desktop.in.h:3
-msgid "mp3;tag;audio;"
+msgid "mp3;tag;audio"
 msgstr ""
 
 #: ../src/about.c:139
diff --git a/src/mb_search.h b/src/mb_search.h
index c9e5a37..195499e 100755
--- a/src/mb_search.h
+++ b/src/mb_search.h
@@ -33,8 +33,8 @@
  ****************/
 
 #define NAME_MAX_SIZE 256
-#define SEARCH_LIMIT_INT 2
-#define SEARCH_LIMIT_STR "2"
+#define SEARCH_LIMIT_INT 10
+#define SEARCH_LIMIT_STR "10"
 
 GCancellable *mb5_search_cancellable;
 
diff --git a/src/musicbrainz_dialog.c b/src/musicbrainz_dialog.c
index 54099bb..dcaae05 100755
--- a/src/musicbrainz_dialog.c
+++ b/src/musicbrainz_dialog.c
@@ -447,8 +447,6 @@ manual_search_callback (GObject *source, GAsyncResult *res,
     ManualSearchThreadData *thread_data;
 
     simple_async = G_SIMPLE_ASYNC_RESULT (res);
-    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
-    priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
     thread_data = (ManualSearchThreadData *)user_data;
 
     if (!g_simple_async_result_get_op_res_gboolean (simple_async))
@@ -461,6 +459,8 @@ manual_search_callback (GObject *source, GAsyncResult *res,
         return;
     }
 
+    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
+    priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
     et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (priv->entityView));
     free_mb_tree (&priv->mb_tree_root);
     priv->mb_tree_root = thread_data->node;
@@ -919,8 +919,6 @@ selected_find_callback (GObject *source, GAsyncResult *res,
     EtMusicBrainzDialog *dlg;
     SelectedFindThreadData  *thread_data;
 
-    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
-    mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
     thread_data = user_data;
 
     if (!g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (res)))
@@ -934,6 +932,8 @@ selected_find_callback (GObject *source, GAsyncResult *res,
         return;
     }
 
+    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
+    mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
     free_mb_tree (&mb_dialog_priv->mb_tree_root);
     mb_dialog_priv->mb_tree_root = thread_data->node;
     et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (mb_dialog_priv->entityView));
@@ -1211,9 +1211,7 @@ discid_search_callback (GObject *source, GAsyncResult *res,
     DiscIDSearchThreadData *thread_data;
 
     thread_data = user_data;
-    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
-    mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
-
+    
     if (!g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (res)))
     {
         g_object_unref (res);
@@ -1222,6 +1220,8 @@ discid_search_callback (GObject *source, GAsyncResult *res,
         return;
     }
 
+    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
+    mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
     free_mb_tree (&mb_dialog_priv->mb_tree_root);
     mb_dialog_priv->mb_tree_root = thread_data->node;
     et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (mb_dialog_priv->entityView));
@@ -1366,8 +1366,6 @@ freedbid_search_callback (GObject *source, GAsyncResult *res,
     EtMusicBrainzDialog *dlg;
     FreeDBIDSearchThreadData *thread_data;
 
-    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
-    mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
     thread_data = user_data;
 
     if (!g_simple_async_result_get_op_res_gboolean (G_SIMPLE_ASYNC_RESULT (res)))
@@ -1380,6 +1378,8 @@ freedbid_search_callback (GObject *source, GAsyncResult *res,
         return;
     }
 
+    dlg = ET_MUSICBRAINZ_DIALOG (mbDialog);
+    mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (dlg);
     free_mb_tree (&mb_dialog_priv->mb_tree_root);
     mb_dialog_priv->mb_tree_root = thread_data->node;
     et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (mb_dialog_priv->entityView));
@@ -2033,6 +2033,11 @@ et_music_brainz_dialog_stop_set_sensitive (gboolean sensitive)
 {
     EtMusicBrainzDialogPrivate *mb_dialog_priv;
 
+    if (!IS_ET_MUSICBRAINZ_DIALOG (mbDialog))
+    {
+        return;
+    }
+
     mb_dialog_priv = ET_MUSICBRAINZ_DIALOG_GET_PRIVATE (ET_MUSICBRAINZ_DIALOG (mbDialog));
     gtk_widget_set_sensitive (GTK_WIDGET (gtk_builder_get_object (builder, "btn_stop")),
                               sensitive);
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]