Merge branch 'master' into devel

Conflicts:
	deadbeef.h
	metacache.c
	playlist.c
	plugins.c
	plugins/gtkui/Makefile.am
	plugins/gtkui/ddbcellrenderertextmultiline.c
	plugins/gtkui/ddbcellrenderertextmultiline.h
	plugins/gtkui/ddbequalizer.c
	plugins/gtkui/ddbequalizer.h
	plugins/gtkui/ddbseekbar.c
	plugins/gtkui/ddbseekbar.h
	plugins/gtkui/ddbtabstrip.c
	plugins/gtkui/fileman.c
	plugins/gtkui/gtkui.c
	plugins/gtkui/interface.c
	plugins/gtkui/plcommon.c
	plugins/gtkui/trkproperties.c

1 files changed, 60 insertions, 32 deletions

diff --git a/plugins/gtkui/ddbseekbar.c b/plugins/gtkui/ddbseekbar.c
index d70ebc05..f1b3a836 100644
--- a/plugins/gtkui/ddbseekbar.c
+++ b/plugins/gtkui/ddbseekbar.c
@@ -1,6 +1,3 @@
-/* ddbseekbar.c generated by valac, the Vala compiler
- * generated from ddbseekbar.vala, do not modify */
-
 /*
     DeaDBeeF - ultimate music player for GNU/Linux systems with X11
     Copyright (C) 2009-2010 Alexey Yakovenko <waker@users.sourceforge.net>
@@ -24,8 +21,8 @@
 #include <glib-object.h>
 #include <gtk/gtk.h>
 #include <gdk/gdk.h>
-#include <gtkui.h>
 #include <drawing.h>
+#include <gtkui.h>
 
 
 #define DDB_TYPE_SEEKBAR (ddb_seekbar_get_type ())
@@ -55,10 +52,14 @@ GType ddb_seekbar_get_type (void);
 enum  {
 	DDB_SEEKBAR_DUMMY_PROPERTY
 };
-static void ddb_seekbar_real_realize (GtkWidget* base);
-static void ddb_seekbar_real_unrealize (GtkWidget* base);
-static void ddb_seekbar_real_size_request (GtkWidget* base, GtkRequisition* requisition);
+#if GTK_CHECK_VERSION(3,0,0)
+static void ddb_seekbar_get_preferred_width (GtkWidget* base, gint *minimal_width, gint *natural_width);
+static void ddb_seekbar_get_preferred_height (GtkWidget* base, gint *minimal_height, gint *natural_height);
+#else
 static gboolean ddb_seekbar_real_expose_event (GtkWidget* base, GdkEventExpose* event);
+#endif
+static void ddb_seekbar_real_size_request (GtkWidget* base, GtkRequisition* requisition);
+static gboolean ddb_seekbar_real_draw (GtkWidget* base, cairo_t *cr);
 static gboolean ddb_seekbar_real_button_press_event (GtkWidget* base, GdkEventButton* event);
 static gboolean ddb_seekbar_real_button_release_event (GtkWidget* base, GdkEventButton* event);
 static gboolean ddb_seekbar_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event);
@@ -68,43 +69,57 @@ DdbSeekbar* ddb_seekbar_construct (GType object_type);
 static GObject * ddb_seekbar_constructor (GType type, guint n_construct_properties, GObjectConstructParam * construct_properties);
 
 
+#if GTK_CHECK_VERSION(3,0,0)
+static void ddb_seekbar_get_preferred_width (GtkWidget* widget, gint *minimal_width, gint *natural_width) {
+    GtkRequisition requisition;
 
-static void ddb_seekbar_real_realize (GtkWidget* base) {
-	DdbSeekbar * self;
-	self = (DdbSeekbar*) base;
-	gtk_widget_set_has_window ((GtkWidget*) self, FALSE);
-	GTK_WIDGET_CLASS (ddb_seekbar_parent_class)->realize (GTK_WIDGET (self));
+    ddb_seekbar_real_size_request (widget, &requisition);
+
+    *minimal_width = *natural_width = requisition.width;
 }
 
+static void ddb_seekbar_get_preferred_height (GtkWidget* widget, gint *minimal_height, gint *natural_height) {
+    GtkRequisition requisition;
 
-static void ddb_seekbar_real_unrealize (GtkWidget* base) {
-	DdbSeekbar * self;
-	self = (DdbSeekbar*) base;
-	GTK_WIDGET_CLASS (ddb_seekbar_parent_class)->unrealize (GTK_WIDGET (self));
-}
+    ddb_seekbar_real_size_request (widget, &requisition);
 
+    *minimal_height = *natural_height = requisition.height;
+}
+#endif
 
 static void ddb_seekbar_real_size_request (GtkWidget* base, GtkRequisition* requisition) {
 	DdbSeekbar * self;
+	GtkRequisition _vala_requisition = {0};
 	self = (DdbSeekbar*) base;
+	if (requisition) {
+		*requisition = _vala_requisition;
+	}
 }
 
+static gboolean ddb_seekbar_real_draw (GtkWidget* base, cairo_t *cr) {
+	seekbar_draw (base, cr);
+	return FALSE;
+}
 
+#if !GTK_CHECK_VERSION(3,0,0)
 static gboolean ddb_seekbar_real_expose_event (GtkWidget* base, GdkEventExpose* event) {
-	DdbSeekbar * self;
-	gboolean result = FALSE;
-	self = (DdbSeekbar*) base;
-	seekbar_draw (GTK_WIDGET (self));
-	result = TRUE;
-	return result;
+    cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (base));
+    ddb_seekbar_real_draw (base, cr);
+    cairo_destroy (cr);
+	return FALSE;
 }
-
+#endif
 
 static gboolean ddb_seekbar_real_button_press_event (GtkWidget* base, GdkEventButton* event) {
 	DdbSeekbar * self;
 	gboolean result = FALSE;
+	GdkEventButton _tmp0_;
+	gboolean _tmp1_ = FALSE;
 	self = (DdbSeekbar*) base;
-	result = on_seekbar_button_press_event ((GtkWidget*) self, event);
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = on_seekbar_button_press_event ((GtkWidget*) self, &_tmp0_);
+	result = _tmp1_;
 	return result;
 }
 
@@ -112,8 +127,13 @@ static gboolean ddb_seekbar_real_button_press_event (GtkWidget* base, GdkEventBu
 static gboolean ddb_seekbar_real_button_release_event (GtkWidget* base, GdkEventButton* event) {
 	DdbSeekbar * self;
 	gboolean result = FALSE;
+	GdkEventButton _tmp0_;
+	gboolean _tmp1_ = FALSE;
 	self = (DdbSeekbar*) base;
-	result = on_seekbar_button_release_event ((GtkWidget*) self, event);
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = on_seekbar_button_release_event ((GtkWidget*) self, &_tmp0_);
+	result = _tmp1_;
 	return result;
 }
 
@@ -121,8 +141,13 @@ static gboolean ddb_seekbar_real_button_release_event (GtkWidget* base, GdkEvent
 static gboolean ddb_seekbar_real_motion_notify_event (GtkWidget* base, GdkEventMotion* event) {
 	DdbSeekbar * self;
 	gboolean result = FALSE;
+	GdkEventMotion _tmp0_;
+	gboolean _tmp1_ = FALSE;
 	self = (DdbSeekbar*) base;
-	result = on_seekbar_motion_notify_event ((GtkWidget*) self, event);
+	g_return_val_if_fail (event != NULL, FALSE);
+	_tmp0_ = *event;
+	_tmp1_ = on_seekbar_motion_notify_event ((GtkWidget*) self, &_tmp0_);
+	result = _tmp1_;
 	return result;
 }
 
@@ -131,6 +156,7 @@ static gboolean ddb_seekbar_real_configure_event (GtkWidget* base, GdkEventConfi
 	DdbSeekbar * self;
 	gboolean result = FALSE;
 	self = (DdbSeekbar*) base;
+	g_return_val_if_fail (event != NULL, FALSE);
 	gtkui_init_theme_colors ();
 	result = FALSE;
 	return result;
@@ -156,18 +182,20 @@ static GObject * ddb_seekbar_constructor (GType type, guint n_construct_properti
 	parent_class = G_OBJECT_CLASS (ddb_seekbar_parent_class);
 	obj = parent_class->constructor (type, n_construct_properties, construct_properties);
 	self = DDB_SEEKBAR (obj);
-	{
-	}
 	return obj;
 }
 
 
 static void ddb_seekbar_class_init (DdbSeekbarClass * klass) {
 	ddb_seekbar_parent_class = g_type_class_peek_parent (klass);
-	GTK_WIDGET_CLASS (klass)->realize = ddb_seekbar_real_realize;
-	GTK_WIDGET_CLASS (klass)->unrealize = ddb_seekbar_real_unrealize;
+#if GTK_CHECK_VERSION(3,0,0)
+	GTK_WIDGET_CLASS (klass)->get_preferred_width = ddb_seekbar_get_preferred_width;
+	GTK_WIDGET_CLASS (klass)->get_preferred_height = ddb_seekbar_get_preferred_height;
+	GTK_WIDGET_CLASS (klass)->draw = ddb_seekbar_real_draw;
+#else
 	GTK_WIDGET_CLASS (klass)->size_request = ddb_seekbar_real_size_request;
 	GTK_WIDGET_CLASS (klass)->expose_event = ddb_seekbar_real_expose_event;
+#endif
 	GTK_WIDGET_CLASS (klass)->button_press_event = ddb_seekbar_real_button_press_event;
 	GTK_WIDGET_CLASS (klass)->button_release_event = ddb_seekbar_real_button_release_event;
 	GTK_WIDGET_CLASS (klass)->motion_notify_event = ddb_seekbar_real_motion_notify_event;
@@ -177,6 +205,7 @@ static void ddb_seekbar_class_init (DdbSeekbarClass * klass) {
 
 
 static void ddb_seekbar_instance_init (DdbSeekbar * self) {
+	gtk_widget_set_has_window ((GtkWidget*) self, FALSE);
 }
 
 
@@ -193,4 +222,3 @@ GType ddb_seekbar_get_type (void) {
 
 
 
-