Marlin

Merge lp:~evfool/marlin/fixbuildproblems into lp:marlin/0.x

  1. fixbuildproblems
  2. Merge into trunk
Proposed by Robert Roth
Status: Merged
Merged at revision: 133
Proposed branch: lp:~evfool/marlin/fixbuildproblems
Merge into: lp:marlin/0.x
Diff against target: 56 lines (+5/-5)
3 files modified
src/View/Chrome/ColorWidget.vala (+1/-1)
src/fm-directory-view.c (+3/-3)
src/marlin-places-sidebar.c (+1/-1)
To merge this branch: bzr merge lp:~evfool/marlin/fixbuildproblems
Reviewer Review Type Date Requested Status
The elementary Project Pending
Review via email: mp+51830@code.launchpad.net

Description of the change

Fixed build errors, code is buildable again.

To post a comment you must log in.
Revision history for this message
ammonkey (am-monkeyd) wrote :

merged. thx i am back coding on it ;)

Revision history for this message
Robert Roth (evfool) wrote :

welcome back :)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/View/Chrome/ColorWidget.vala'
2--- src/View/Chrome/ColorWidget.vala 2010-12-14 17:58:37 +0000
3+++ src/View/Chrome/ColorWidget.vala 2011-03-01 22:44:13 +0000
4@@ -158,7 +158,7 @@
5 default:
6 case "fill":
7 Gdk.RGBA rgba = Gdk.RGBA();
8- rgba.parse (Preferences.tags_colors[color], rgba);
9+ rgba.parse (Preferences.tags_colors[color]);
10 //rgba.alpha = 0.7;
11 cairo_set_source_rgba (cr, rgba);
12 cr.fill();
13
14=== modified file 'src/fm-directory-view.c'
15--- src/fm-directory-view.c 2011-01-12 02:48:02 +0000
16+++ src/fm-directory-view.c 2011-03-01 22:44:13 +0000
17@@ -785,7 +785,7 @@
18 GdkWindow *window = gtk_widget_get_window (widget);
19
20 gdk_window_get_device_position ( window, pointer, &x, &y, NULL);
21- gdk_window_get_geometry (window, NULL, NULL, &w, &h, NULL);
22+ gdk_window_get_geometry (window, NULL, NULL, &w, &h);
23
24 /* check if we are near the edge (vertical) */
25 offset = y - (2 * 20);
26@@ -1092,7 +1092,7 @@
27 if (G_UNLIKELY (gtk_selection_data_get_format (selection_data) == 8 && gtk_selection_data_get_length (selection_data) == 1 && gtk_selection_data_get_data (selection_data)[0] == 'F'))
28 {
29 /* indicate that we don't provide "F" fallback */
30- gdk_property_change (GDK_DRAWABLE (gdk_drag_context_get_source_window (context)),
31+ gdk_property_change (gdk_drag_context_get_source_window (context),
32 gdk_atom_intern_static_string ("XdndDirectSave0"),
33 gdk_atom_intern_static_string ("text/plain"), 8,
34 GDK_PROP_MODE_REPLACE, (const guchar *) "", 0);
35@@ -1308,7 +1308,7 @@
36 }*/
37 if (G_LIKELY (file != NULL && file->is_directory
38 && gof_file_is_writable (file))) {
39- printf ("%s get_suggested_action for file = directory\n");
40+ printf ("%s get_suggested_action for file = directory\n", file->name);
41 action = gdk_drag_context_get_suggested_action (context);
42 }
43
44
45=== modified file 'src/marlin-places-sidebar.c'
46--- src/marlin-places-sidebar.c 2011-01-16 00:45:56 +0000
47+++ src/marlin-places-sidebar.c 2011-03-01 22:44:13 +0000
48@@ -1061,7 +1061,7 @@
49 GdkWindow *window = gtk_widget_get_window (widget);
50
51 gdk_window_get_device_position ( window, pointer, &x, &y, NULL);
52- gdk_window_get_geometry (window, NULL, NULL, &w, &h, NULL);
53+ gdk_window_get_geometry (window, NULL, NULL, &w, &h);
54
55 /* check if we are near the edge (vertical) */
56 offset = y - (2 * 20);

Subscribers

People subscribed via source and target branches

to status/vote changes: