Merge lp:~kekun-plazas/dazzle/gtk3-port into lp:~hypn0s/dazzle/test

Proposed by Adrien Plazas
Status: Approved
Approved by: Julien Legras
Approved revision: 10
Proposed branch: lp:~kekun-plazas/dazzle/gtk3-port
Merge into: lp:~hypn0s/dazzle/test
Diff against target: 31 lines (+4/-3)
1 file modified
Dazzle.vala (+4/-3)
To merge this branch: bzr merge lp:~kekun-plazas/dazzle/gtk3-port
Reviewer Review Type Date Requested Status
Julien Legras Approve
Review via email: mp+74161@code.launchpad.net

Description of the change

The code has been ported to GTK3.

To post a comment you must log in.
Revision history for this message
Julien Legras (hypn0s) :
review: Approve

Unmerged revisions

10. By Adrien Plazas

Ported to GTK3

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Dazzle.vala'
2--- Dazzle.vala 2011-09-01 08:22:24 +0000
3+++ Dazzle.vala 2011-09-06 05:42:22 +0000
4@@ -1,7 +1,8 @@
5+using Gdk;
6 using Gtk;
7 using Gst;
8
9-public class Dazzle : Window {
10+public class Dazzle : Gtk.Window {
11
12 DrawingArea drawing_area;
13
14@@ -131,7 +132,7 @@
15
16 private void on_play () {
17 var xoverlay = sink as XOverlay;
18- xoverlay.set_xwindow_id (Gdk.x11_drawable_get_xid (this.drawing_area.window));
19+ xoverlay.set_xwindow_id (Gdk.X11Window.get_xid (this.drawing_area.get_window()));
20 if (isPlaying) {
21 isPlaying = false;
22 play_button.set_stock_id (Stock.MEDIA_PLAY);
23@@ -283,7 +284,7 @@
24 Gtk.init (ref args);
25 var sample = new Dazzle (v);
26 sample.title = "Dazzle";
27- sample.position = WindowPosition.CENTER;
28+ sample.set_position(WindowPosition.CENTER);
29 sample.destroy.connect (Gtk.main_quit);
30 Gtk.main ();
31 Gtk.main_quit();

Subscribers

People subscribed via source and target branches

to all changes: