removed calls to gtk_vbox_new in video.c, now builds fine with --enable-gstreamer

diff --git a/src/.render.c.swp b/src/.render.c.swp
deleted file mode 100644 (file)
index d336915..0000000
Binary files a/src/.render.c.swp and /dev/null differ

diff --git a/src/renderheadword.c b/src/renderheadword.c
index 9a962ce..9128d0e 100644 (file)
--- a/src/renderheadword.c
+++ b/src/renderheadword.c
@@ -17,7 +17,7 @@ static void render_headword_get_size(GtkCellRenderer *cell,
 static void render_headword(GtkCellRenderer      *cell,
        cairo_t              *cr,
        GtkWidget            *widget,
-       GdkRectangle         *background_area,
+       const GdkRectangle   *background_area,
        const GdkRectangle   *cell_area,
        GtkCellRendererState  flags);
 
@@ -240,7 +240,7 @@ static void headword_fix_text(gchar *txt)
 static void render_headword(GtkCellRenderer      *cell,
        cairo_t              *cr,
        GtkWidget            *widget,
-       GdkRectangle         *background_area,
+       const GdkRectangle   *background_area,
        const GdkRectangle   *cell_area,
        GtkCellRendererState  flags)
 {

diff --git a/src/textview.c b/src/textview.c
index 4ba6506..e2d858c 100644 (file)
--- a/src/textview.c
+++ b/src/textview.c
@@ -71,7 +71,7 @@ void textview_underline_link(TextView *self, GdkEventMotion *event)
     self->tag = textview_get_link_under_cursor(self, (gint)(event->x), (gint)(event->y));
     cursor = gdk_cursor_new(self->tag ? GDK_HAND2 : GDK_LEFT_PTR);
     gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(self), GTK_TEXT_WINDOW_TEXT), cursor);
-    gdk_cursor_unref(cursor);
+    g_object_unref(cursor);
     if(self->tag)
         g_object_set(G_OBJECT(self->tag), "underline", PANGO_UNDERLINE_SINGLE, NULL);
 }
@@ -87,7 +87,7 @@ gint textview_leave_notify_cb(GtkWidget *widget, GdkEventCrossing *event, gpoint
     GdkCursor *cursor = gdk_cursor_new(GDK_LEFT_PTR);
     TextView *view = TEXTVIEW(widget);
     gdk_window_set_cursor(gtk_text_view_get_window(GTK_TEXT_VIEW(widget), GTK_TEXT_WINDOW_TEXT), cursor);
-    gdk_cursor_unref(cursor);
+    g_object_unref(cursor);
     textview_underline_link(view, NULL);
     view->tag = NULL;
     return FALSE;

diff --git a/src/video.c b/src/video.c
index 93922f6..341b5cb 100644 (file)
--- a/src/video.c
+++ b/src/video.c
@@ -105,9 +105,10 @@ static void video_play_pause_set_icon(Video *self, gboolean play)
 
 static void video_play_pause(Video *self, gboolean play)
 {
-    if(self->output->window && self->pipeline)
+    GdkWindow *window = gtk_widget_get_window(self->output);
+    if(window && self->pipeline)
     {
-       gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(self->sink), GDK_WINDOW_XID(self->output->window));
+       gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(self->sink), GDK_WINDOW_XID(window));
        gst_element_set_state(self->pipeline, play ? GST_STATE_PLAYING : GST_STATE_PAUSED);
        video_play_pause_set_icon(self, play);
     }
@@ -306,7 +307,7 @@ static void video_init(Video *self)
     GtkWidget *hbox = NULL;
 #ifdef ENABLE_GSTREAMER
     self->play_btn = NULL;
-    GtkWidget *vbox = gtk_vbox_new(FALSE, 0);
+    GtkWidget *vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
     gtk_container_add(GTK_CONTAINER(self), vbox);
 
     self->output = gtk_drawing_area_new();