The Underweb

Merge lp:~jonnor/underweb/underweb into lp:underweb

  1. underweb
  2. Merge into trunk
Proposed by Jon Nordby
Status: Needs review
Proposed branch: lp:~jonnor/underweb/underweb
Merge into: lp:underweb
Diff against target: 76 lines (+18/-9)
3 files modified
.bzrignore (+9/-0)
libmentiras/layoutengine.vala (+8/-8)
libmentiras/textlayout.vala (+1/-1)
To merge this branch: bzr merge lp:~jonnor/underweb/underweb
Reviewer Review Type Date Requested Status
August Black Pending
Review via email: mp+134868@code.launchpad.net

Description of the change

Compile error fixes

To post a comment you must log in.
lp:~jonnor/underweb/underweb updated
4. By Jon Nordby

Fix compile errors on new GLib/Gtk versions, add .bzrignore

New Glib introduced a Menu and MenuItem class, so now need to
explicitly specify that it is Gtk.Menu{,Item} that is wanted.

The .bzrignore cleans up the output of "bzr status" and makes
it a bit harder to accidentially commit generated files.

Unmerged revisions

4. By Jon Nordby

Fix compile errors on new GLib/Gtk versions, add .bzrignore

New Glib introduced a Menu and MenuItem class, so now need to
explicitly specify that it is Gtk.Menu{,Item} that is wanted.

The .bzrignore cleans up the output of "bzr status" and makes
it a bit harder to accidentially commit generated files.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2012-11-19 11:32:25 +0000
4@@ -0,0 +1,9 @@
5+*.gir
6+*.typelib
7+*.vapi
8+*.so*
9+./*.c
10+./*.h
11+libmentiras/*.c
12+libmentiras/*.h
13+underweb
14
15=== modified file 'libmentiras/layoutengine.vala'
16--- libmentiras/layoutengine.vala 2011-11-11 17:45:55 +0000
17+++ libmentiras/layoutengine.vala 2012-11-19 11:32:25 +0000
18@@ -343,29 +343,29 @@
19 this.destroy();
20 }
21 private Widget create_menu_bar () {
22- var menu_file = new Menu ();
23+ var menu_file = new Gtk.Menu ();
24
25- var image_menu_item_set_bgcolor = new MenuItem.with_mnemonic ("Set BGcolor");
26+ var image_menu_item_set_bgcolor = new Gtk.MenuItem.with_mnemonic ("Set BGcolor");
27 image_menu_item_set_bgcolor.activate.connect (this.on_bgcolor);
28 menu_file.add (image_menu_item_set_bgcolor);
29
30- var image_menu_item_new_rect = new MenuItem.with_mnemonic ("New Rectangle");
31+ var image_menu_item_new_rect = new Gtk.MenuItem.with_mnemonic ("New Rectangle");
32 image_menu_item_new_rect.activate.connect (this.on_new_rectangle);
33 menu_file.add (image_menu_item_new_rect);
34
35- var image_menu_item_new_tri = new MenuItem.with_mnemonic ("New Triangle");
36+ var image_menu_item_new_tri = new Gtk.MenuItem.with_mnemonic ("New Triangle");
37 image_menu_item_new_tri.activate.connect (this.on_new_triangle);
38 menu_file.add (image_menu_item_new_tri);
39
40- var image_menu_item_new_circ = new MenuItem.with_mnemonic ("New Circle");
41+ var image_menu_item_new_circ = new Gtk.MenuItem.with_mnemonic ("New Circle");
42 image_menu_item_new_circ.activate.connect (this.on_new_circle);
43 menu_file.add (image_menu_item_new_circ);
44
45- var image_menu_item_new_img = new MenuItem.with_mnemonic ("New Image");
46+ var image_menu_item_new_img = new Gtk.MenuItem.with_mnemonic ("New Image");
47 image_menu_item_new_img.activate.connect (this.on_new_image);
48 menu_file.add (image_menu_item_new_img);
49
50- var image_menu_item_new_video = new MenuItem.with_mnemonic ("New Video");
51+ var image_menu_item_new_video = new Gtk.MenuItem.with_mnemonic ("New Video");
52 image_menu_item_new_video.activate.connect (this.on_new_video);
53 menu_file.add (image_menu_item_new_video);
54
55@@ -381,7 +381,7 @@
56 image_menu_item_quit.activate.connect (on_quit);
57 menu_file.add (image_menu_item_quit);
58
59- var menu_item_file = new MenuItem.with_mnemonic ("_Layout");
60+ var menu_item_file = new Gtk.MenuItem.with_mnemonic ("_Layout");
61
62 menu_item_file.set_submenu (menu_file);
63 var menu_bar = new MenuBar ();
64
65=== modified file 'libmentiras/textlayout.vala'
66--- libmentiras/textlayout.vala 2011-11-11 17:45:55 +0000
67+++ libmentiras/textlayout.vala 2012-11-19 11:32:25 +0000
68@@ -202,7 +202,7 @@
69
70 int text_wordstart=0;
71 int attr_idx =0;
72- unowned Pango.LayoutIter iter = layout.get_iter();
73+ Pango.LayoutIter iter = layout.get_iter();
74
75 // cairo rects are in doubles
76 // Pango rects are in integers

Subscribers

People subscribed via source and target branches

to all changes: