[easytag/wip/musicbrainz-support] Fixed UI Issues
- From: Abhinav Jangda <abhijangda src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [easytag/wip/musicbrainz-support] Fixed UI Issues
- Date: Sun, 22 Jun 2014 16:38:23 +0000 (UTC)
commit b5c9dde488257860b008bf1cbb52a6c5a4b2c05f
Author: Abhinav <abhijangda hotmail com>
Date: Sun Jun 22 22:07:22 2014 +0530
Fixed UI Issues
src/mbentityview.c | 9 +++++++++
src/mbentityview.h | 3 ++-
src/musicbrainz_dialog.c | 18 ++++++++++++++----
tests/error.xml | 1 +
4 files changed, 26 insertions(+), 5 deletions(-)
---
diff --git a/src/mbentityview.c b/src/mbentityview.c
index 8de0e5e..b422080 100644
--- a/src/mbentityview.c
+++ b/src/mbentityview.c
@@ -1114,6 +1114,15 @@ et_mb_entity_view_refresh_current_level (EtMbEntityView *entity_view)
{
}
+void
+et_mb_entity_view_clear_all (EtMbEntityView *entity_view)
+{
+ EtMbEntityViewPrivate *priv;
+
+ priv = ET_MB_ENTITY_VIEW_GET_PRIVATE (entity_view);
+ gtk_list_store_clear (GTK_LIST_STORE (priv->list_store));
+}
+
/*
* et_mb_entity_view_destroy:
* @object: EtMbEntityView
diff --git a/src/mbentityview.h b/src/mbentityview.h
index f6abde6..8f63f3d 100644
--- a/src/mbentityview.h
+++ b/src/mbentityview.h
@@ -122,7 +122,8 @@ void
et_mb_entity_view_select_up (EtMbEntityView *entity_view);
void
et_mb_entity_view_select_down (EtMbEntityView *entity_view);
-
+void
+et_mb_entity_view_clear_all (EtMbEntityView *entity_view);
G_END_DECLS
#endif /* __MB_ENTITY_VIEW_H__ */
\ No newline at end of file
diff --git a/src/musicbrainz_dialog.c b/src/musicbrainz_dialog.c
index 12cb059..7e86d19 100644
--- a/src/musicbrainz_dialog.c
+++ b/src/musicbrainz_dialog.c
@@ -244,17 +244,24 @@ btn_manual_find_clicked (GtkWidget *btn, gpointer user_data)
int type;
ManualSearchThreadData *thread_data;
+ cb_manual_search_in = GTK_WIDGET (gtk_builder_get_object (builder,
+ "cbManualSearchIn"));
+ type = gtk_combo_box_get_active (GTK_COMBO_BOX (cb_manual_search_in));
+
+ if (type == -1)
+ {
+ return;
+ }
+
if (g_node_first_child (mb_tree_root))
{
free_mb_tree (mb_tree_root);
mb_tree_root = g_node_new (NULL);
}
+ et_mb_entity_view_clear_all (ET_MB_ENTITY_VIEW (entityView));
cb_manual_search = GTK_WIDGET (gtk_builder_get_object (builder,
"cbManualSearch"));
- cb_manual_search_in = GTK_WIDGET (gtk_builder_get_object (builder,
- "cbManualSearchIn"));
- type = gtk_combo_box_get_active (GTK_COMBO_BOX (cb_manual_search_in));
thread_data = g_malloc (sizeof (ManualSearchThreadData));
thread_data->type = type;
thread_data->text_to_search = gtk_combo_box_text_get_active_text (GTK_COMBO_BOX_TEXT (cb_manual_search));
@@ -377,7 +384,10 @@ tool_btn_refersh_clicked (GtkWidget *btn, gpointer user_data)
static void
btn_manual_stop_clicked (GtkWidget *btn, gpointer user_data)
{
- g_cancellable_cancel (mb5_search_cancellable);
+ if (G_IS_CANCELLABLE (mb5_search_cancellable))
+ {
+ g_cancellable_cancel (mb5_search_cancellable);
+ }
}
/*
diff --git a/tests/error.xml b/tests/error.xml
index c04a5cb..147cdd1 100644
--- a/tests/error.xml
+++ b/tests/error.xml
@@ -1 +1,2 @@
<?xml version="1.0" standalone="yes"?>
+<error><text>Invalid mbid.</text><text>For usage, please see:
http://musicbrainz.org/development/mmd</text></error>
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]