Robert Roth has proposed merging lp:~evfool/marlin/fixbuildproblems into
lp:marlin.
Requested reviews:
The elementary Project (elementaryproject)
For more details, see:
https://code.launchpad.net/~evfool/marlin/fixbuildproblems/+merge/51830
Fixed build errors, code is buildable again.
--
https://code.launchpad.net/~evfool/marlin/fixbuildproblems/+merge/51830
Your team The elementary Project is requested to review the proposed merge of
lp:~evfool/marlin/fixbuildproblems into lp:marlin.
=== modified file 'src/View/Chrome/ColorWidget.vala'
--- src/View/Chrome/ColorWidget.vala 2010-12-14 17:58:37 +0000
+++ src/View/Chrome/ColorWidget.vala 2011-03-01 22:44:13 +0000
@@ -158,7 +158,7 @@
default:
case "fill":
Gdk.RGBA rgba = Gdk.RGBA();
- rgba.parse (Preferences.tags_colors[color], rgba);
+ rgba.parse (Preferences.tags_colors[color]);
//rgba.alpha = 0.7;
cairo_set_source_rgba (cr, rgba);
cr.fill();
=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c 2011-01-12 02:48:02 +0000
+++ src/fm-directory-view.c 2011-03-01 22:44:13 +0000
@@ -785,7 +785,7 @@
GdkWindow *window = gtk_widget_get_window (widget);
gdk_window_get_device_position ( window, pointer, &x, &y, NULL);
- gdk_window_get_geometry (window, NULL, NULL, &w, &h, NULL);
+ gdk_window_get_geometry (window, NULL, NULL, &w, &h);
/* check if we are near the edge (vertical) */
offset = y - (2 * 20);
@@ -1092,7 +1092,7 @@
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'))
{
/* indicate that we don't provide "F" fallback */
- gdk_property_change (GDK_DRAWABLE (gdk_drag_context_get_source_window (context)),
+ gdk_property_change (gdk_drag_context_get_source_window (context),
gdk_atom_intern_static_string ("XdndDirectSave0"),
gdk_atom_intern_static_string ("text/plain"), 8,
GDK_PROP_MODE_REPLACE, (const guchar *) "", 0);
@@ -1308,7 +1308,7 @@
}*/
if (G_LIKELY (file != NULL && file->is_directory
&& gof_file_is_writable (file))) {
- printf ("%s get_suggested_action for file = directory\n");
+ printf ("%s get_suggested_action for file = directory\n", file->name);
action = gdk_drag_context_get_suggested_action (context);
}
=== modified file 'src/marlin-places-sidebar.c'
--- src/marlin-places-sidebar.c 2011-01-16 00:45:56 +0000
+++ src/marlin-places-sidebar.c 2011-03-01 22:44:13 +0000
@@ -1061,7 +1061,7 @@
GdkWindow *window = gtk_widget_get_window (widget);
gdk_window_get_device_position ( window, pointer, &x, &y, NULL);
- gdk_window_get_geometry (window, NULL, NULL, &w, &h, NULL);
+ gdk_window_get_geometry (window, NULL, NULL, &w, &h);
/* check if we are near the edge (vertical) */
offset = y - (2 * 20);
_______________________________________________
Mailing list: https://launchpad.net/~elementaryweb
Post to : [email protected]
Unsubscribe : https://launchpad.net/~elementaryweb
More help : https://help.launchpad.net/ListHelp
