From 9aa9637cb7879b3ad9b0295495220be00dc4eab2 Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <wakeroid@gmail.com>
Date: Sun, 18 Apr 2010 13:55:33 +0200
Subject: removed location entry from metadata page; fixed couple of gtk errors

---
 plugins/gtkui/ddblistview.c   |  2 +-
 plugins/gtkui/deadbeef.glade  | 57 -------------------------------------------
 plugins/gtkui/eq.c            |  6 +++--
 plugins/gtkui/interface.c     | 21 ----------------
 plugins/gtkui/trkproperties.c |  3 ---
 5 files changed, 5 insertions(+), 84 deletions(-)

(limited to 'plugins/gtkui')

diff --git a/plugins/gtkui/ddblistview.c b/plugins/gtkui/ddblistview.c
index 035a75a8..2e16c10a 100644
--- a/plugins/gtkui/ddblistview.c
+++ b/plugins/gtkui/ddblistview.c
@@ -697,7 +697,7 @@ ddb_listview_list_expose_event               (GtkWidget       *widget,
 void
 ddb_listview_list_expose (DdbListview *listview, int x, int y, int w, int h) {
     GtkWidget *widget = listview->list;
-    if (widget->window) {
+    if (widget->window && listview->backbuf) {
         draw_drawable (widget->window, widget->style->black_gc, listview->backbuf, x, y, x, y, w, h);
     }
 }
diff --git a/plugins/gtkui/deadbeef.glade b/plugins/gtkui/deadbeef.glade
index 349879c9..409ae355 100644
--- a/plugins/gtkui/deadbeef.glade
+++ b/plugins/gtkui/deadbeef.glade
@@ -1352,63 +1352,6 @@
 	  <property name="homogeneous">False</property>
 	  <property name="spacing">8</property>
 
-	  <child>
-	    <widget class="GtkHBox" id="hbox23">
-	      <property name="visible">True</property>
-	      <property name="homogeneous">False</property>
-	      <property name="spacing">8</property>
-
-	      <child>
-		<widget class="GtkLabel" id="label27">
-		  <property name="visible">True</property>
-		  <property name="label" translatable="yes">Location:</property>
-		  <property name="use_underline">False</property>
-		  <property name="use_markup">False</property>
-		  <property name="justify">GTK_JUSTIFY_LEFT</property>
-		  <property name="wrap">False</property>
-		  <property name="selectable">False</property>
-		  <property name="xalign">0</property>
-		  <property name="yalign">0.5</property>
-		  <property name="xpad">0</property>
-		  <property name="ypad">0</property>
-		  <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
-		  <property name="width_chars">-1</property>
-		  <property name="single_line_mode">False</property>
-		  <property name="angle">0</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">False</property>
-		  <property name="fill">False</property>
-		</packing>
-	      </child>
-
-	      <child>
-		<widget class="GtkEntry" id="location">
-		  <property name="visible">True</property>
-		  <property name="can_focus">True</property>
-		  <property name="editable">False</property>
-		  <property name="visibility">True</property>
-		  <property name="max_length">0</property>
-		  <property name="text" translatable="yes"></property>
-		  <property name="has_frame">True</property>
-		  <property name="invisible_char">•</property>
-		  <property name="activates_default">False</property>
-		</widget>
-		<packing>
-		  <property name="padding">0</property>
-		  <property name="expand">True</property>
-		  <property name="fill">True</property>
-		</packing>
-	      </child>
-	    </widget>
-	    <packing>
-	      <property name="padding">0</property>
-	      <property name="expand">False</property>
-	      <property name="fill">True</property>
-	    </packing>
-	  </child>
-
 	  <child>
 	    <widget class="GtkScrolledWindow" id="scrolledwindow5">
 	      <property name="visible">True</property>
diff --git a/plugins/gtkui/eq.c b/plugins/gtkui/eq.c
index 494333e0..fef3bda3 100644
--- a/plugins/gtkui/eq.c
+++ b/plugins/gtkui/eq.c
@@ -367,6 +367,8 @@ eq_window_hide (void) {
 
 void
 eq_window_destroy (void) {
-    gtk_widget_destroy (eqwin);
-    eqwin = NULL;
+    if (eqwin) {
+        gtk_widget_destroy (eqwin);
+        eqwin = NULL;
+    }
 }
diff --git a/plugins/gtkui/interface.c b/plugins/gtkui/interface.c
index 02ea5ec8..e92d410b 100644
--- a/plugins/gtkui/interface.c
+++ b/plugins/gtkui/interface.c
@@ -1116,9 +1116,6 @@ create_trackproperties (void)
   GtkWidget *trackproperties;
   GtkWidget *notebook3;
   GtkWidget *vbox16;
-  GtkWidget *hbox23;
-  GtkWidget *label27;
-  GtkWidget *location;
   GtkWidget *scrolledwindow5;
   GtkWidget *metalist;
   GtkWidget *hbuttonbox1;
@@ -1148,21 +1145,6 @@ create_trackproperties (void)
   gtk_container_add (GTK_CONTAINER (notebook3), vbox16);
   gtk_container_set_border_width (GTK_CONTAINER (vbox16), 12);
 
-  hbox23 = gtk_hbox_new (FALSE, 8);
-  gtk_widget_show (hbox23);
-  gtk_box_pack_start (GTK_BOX (vbox16), hbox23, FALSE, TRUE, 0);
-
-  label27 = gtk_label_new ("Location:");
-  gtk_widget_show (label27);
-  gtk_box_pack_start (GTK_BOX (hbox23), label27, FALSE, FALSE, 0);
-  gtk_misc_set_alignment (GTK_MISC (label27), 0, 0.5);
-
-  location = gtk_entry_new ();
-  gtk_widget_show (location);
-  gtk_box_pack_start (GTK_BOX (hbox23), location, TRUE, TRUE, 0);
-  gtk_editable_set_editable (GTK_EDITABLE (location), FALSE);
-  gtk_entry_set_invisible_char (GTK_ENTRY (location), 8226);
-
   scrolledwindow5 = gtk_scrolled_window_new (NULL, NULL);
   gtk_widget_show (scrolledwindow5);
   gtk_box_pack_start (GTK_BOX (vbox16), scrolledwindow5, TRUE, TRUE, 0);
@@ -1243,9 +1225,6 @@ create_trackproperties (void)
   GLADE_HOOKUP_OBJECT_NO_REF (trackproperties, trackproperties, "trackproperties");
   GLADE_HOOKUP_OBJECT (trackproperties, notebook3, "notebook3");
   GLADE_HOOKUP_OBJECT (trackproperties, vbox16, "vbox16");
-  GLADE_HOOKUP_OBJECT (trackproperties, hbox23, "hbox23");
-  GLADE_HOOKUP_OBJECT (trackproperties, label27, "label27");
-  GLADE_HOOKUP_OBJECT (trackproperties, location, "location");
   GLADE_HOOKUP_OBJECT (trackproperties, scrolledwindow5, "scrolledwindow5");
   GLADE_HOOKUP_OBJECT (trackproperties, metalist, "metalist");
   GLADE_HOOKUP_OBJECT (trackproperties, hbuttonbox1, "hbuttonbox1");
diff --git a/plugins/gtkui/trkproperties.c b/plugins/gtkui/trkproperties.c
index 68db8def..633ffe65 100644
--- a/plugins/gtkui/trkproperties.c
+++ b/plugins/gtkui/trkproperties.c
@@ -183,9 +183,6 @@ show_track_properties_dlg (DB_playItem_t *it) {
     GtkWidget *widget = trackproperties;
     GtkWidget *w;
     const char *meta;
-    // location
-    w = lookup_widget (widget, "location");
-    gtk_entry_set_text (GTK_ENTRY (w), it->fname);
 
     deadbeef->pl_lock ();
     int i = 0;
-- 
cgit v1.2.3