Merge lp:~gero-bare/pantheon-files/clang-build into lp:~elementary-apps/pantheon-files/trunk

[Gero.Bare]

This branch introduces the capabilities to build pantheon-files with clang out of box.

For this reason were added dependencies (gmodule 2, and the math library) to the cmake recipe (probably this dependencies are resolved in gcc by default I don't know).

The dependency of XParseGeometry was removed because introduces Xlib dependency, now gtk handles it.

Dead code removed.

Another changes are some function prototypes that are missing and prevents clang build.

Changed g_return_if_fail with the correct g_return_val_if_fail to match function prototypes.

Fix an uninitialized variable that crash the binary.

[Cody Garver (codygarver)]

x11 as a dependency does not look good

[Gero.Bare (gero-bare)]

> x11 as a dependency does not look good

Cody Garver thanks for the comment, but it is needed, there are symbols that won't allow to compile sorry.

If that's a problem I think that I could make some changes but I don't know.

[Gero.Bare (gero-bare)]

> x11 as a dependency does not look good

Ok Cody Garver Now the X11 dependency is fixed. I removed a whole bunch of dead code.

Fixed some bugs and clang build it happily.

This is the advantage of being able to use another compiler. If it wasn't for that I would never being able to discover our dependency in Xlib.

Now the ability to build with clang seems to be more the result of this patch than its aim.

Please I would be more than happy to ear some comments.

[Cody Garver (codygarver)]

I am happy to see x11 code gone. However, it looks like it has at least once side effect. The window does not remember its dimensions if you change them.

Also, please clean up using the code style guide http://elementaryos.org/docs/code/code-style

Once the branch is ready again, I will go hunt down a better reviewer than me.

review: Needs Fixing

[Gero.Bare (gero-bare)]

Thanks for the style guide. I would love also a guide to work and submit.. all the procedure because I'm learning by doing and not by reading (or thinking).

Ok I think we are done. If someone finds another issue...

[Cody Garver (codygarver)]

Rico, do you mind reviewing this?

[xapantu (xapantu)]

I did not see your branch, sorry. I did also some of these changes to be able to compile with clang. I will merge the rest of your changes with my branch and then with the trunk as soon as possible.

Thanks for your work :)

=== modified file 'INSTALL'
--- INSTALL	2013-12-23 21:18:29 +0000
+++ INSTALL	2014-04-26 02:25:06 +0000
@@ -38,3 +38,6 @@
 
     To install only libcore and libwidgets use the following command:
         cmake .. -DLIB_ONLY=true
+
+    To build with clang just add CC=clang before cmake call:
+	CC=clang cmake .. -DCMAKE_INSTALL_PREFIX=/usr
\ No newline at end of file

=== modified file 'libcore/CMakeLists.txt'
--- libcore/CMakeLists.txt	2014-02-24 21:28:17 +0000
+++ libcore/CMakeLists.txt	2014-04-26 02:25:06 +0000
@@ -41,7 +41,6 @@
     eel-fcts.c
     eel-i18n.c
     eel-gtk-extensions.c
-    eel-gdk-extensions.c
     eel-gdk-pixbuf-extensions.c
     eel-pango-extensions.c
     eel-glib-extensions.c
@@ -71,7 +70,6 @@
     eel-accessibility.h
     eel-debug.h
     eel-fcts.h
-    eel-gdk-extensions.h
     eel-gdk-pixbuf-extensions.h
     eel-gio-extensions.h
     eel-glib-extensions.h
@@ -137,7 +135,7 @@
     VERSION ${MARLINCORE_VERSION}
     SOVERSION ${MARLINCORE_SOVERSION})
 
-target_link_libraries (${PKGNAME} ${DEPS_LIBRARIES})
+target_link_libraries (${PKGNAME} ${DEPS_LIBRARIES} m)
 
 install (TARGETS ${PKGNAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/)
 

=== removed file 'libcore/eel-gdk-extensions.c'
--- libcore/eel-gdk-extensions.c	2013-09-09 03:08:16 +0000
+++ libcore/eel-gdk-extensions.c	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-/* eel-gdk-extensions.c: Graphics routines to augment what's in gdk.
- *
- * Copyright (C) 1999, 2000 Eazel, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Darin Adler <[e-mail]>,
- *          Pavel Cisler <[e-mail]>,
- *          Ramiro Estrugo <[e-mail]>
- */
-
-#include "eel-gdk-extensions.h"
-
-#include "eel-glib-extensions.h"
-#include "eel-string.h"
-#include <gdk-pixbuf/gdk-pixbuf.h>
-#include <gdk/gdk.h>
-#include <gdk/gdkx.h>
-#include <stdlib.h>
-#include <pango/pango.h>
-
-/**
- * eel_gdk_rgba_is_dark:
- *
- * Return true if the given color is `dark'
- */
-/*gboolean
-  eel_gdk_rgba_is_dark (const GdkRGBA *color)
-  {
-  int intensity;
-
-  intensity = ((((int) (color->red) >> 8) * 77)
-  + (((int) (color->green) >> 8) * 150)
-  + (((int) (color->blue) >> 8) * 28)) >> 8;
-
-  return intensity < 128;
-  }*/
-
-EelGdkGeometryFlags
-eel_gdk_parse_geometry (const char *string, int *x_return, int *y_return,
-			guint *width_return, guint *height_return)
-{
-    int x11_flags;
-    EelGdkGeometryFlags gdk_flags;
-
-    g_return_val_if_fail (string != NULL, EEL_GDK_NO_VALUE);
-    g_return_val_if_fail (x_return != NULL, EEL_GDK_NO_VALUE);
-    g_return_val_if_fail (y_return != NULL, EEL_GDK_NO_VALUE);
-    g_return_val_if_fail (width_return != NULL, EEL_GDK_NO_VALUE);
-    g_return_val_if_fail (height_return != NULL, EEL_GDK_NO_VALUE);
-
-    x11_flags = XParseGeometry (string, x_return, y_return,
-				width_return, height_return);
-
-    gdk_flags = EEL_GDK_NO_VALUE;
-    if (x11_flags & XValue) {
-	gdk_flags |= EEL_GDK_X_VALUE;
-    }
-    if (x11_flags & YValue) {
-	gdk_flags |= EEL_GDK_Y_VALUE;
-    }
-    if (x11_flags & WidthValue) {
-	gdk_flags |= EEL_GDK_WIDTH_VALUE;
-    }
-    if (x11_flags & HeightValue) {
-	gdk_flags |= EEL_GDK_HEIGHT_VALUE;
-    }
-    if (x11_flags & XNegative) {
-	gdk_flags |= EEL_GDK_X_NEGATIVE;
-    }
-    if (x11_flags & YNegative) {
-	gdk_flags |= EEL_GDK_Y_NEGATIVE;
-    }
-
-    return gdk_flags;
-}
-
-#if 0
-void
-eel_cairo_draw_layout_with_drop_shadow (cairo_t     *cr,
-					GdkRGBA     *text_color,
-					GdkRGBA     *shadow_color,
-					int          x,
-					int          y,
-					PangoLayout *layout)
-{
-    cairo_save (cr);
-
-    gdk_cairo_set_source_rgba (cr, shadow_color);
-    cairo_move_to (cr, x+1, y+1);
-    pango_cairo_show_layout (cr, layout);
-
-    gdk_cairo_set_source_rgba (cr, text_color);
-    cairo_move_to (cr, x, y);
-    pango_cairo_show_layout (cr, layout);
-
-    cairo_restore (cr);
-}
-
-#define CLAMP_COLOR(v) (t = (v), CLAMP (t, 0, 1))
-#define SATURATE(v) ((1.0 - saturation) * intensity + saturation * (v))
-
-void
-eel_make_color_inactive (GdkRGBA *color)
-{
-    double intensity, saturation;
-    gdouble t;
-
-    saturation = 0.7;
-    intensity = color->red * 0.30 + color->green * 0.59 + color->blue * 0.11;
-    color->red = SATURATE (color->red);
-    color->green = SATURATE (color->green);
-    color->blue = SATURATE (color->blue);
-
-    if (intensity > 0.5) {
-	color->red *= 0.9;
-	color->green *= 0.9;
-	color->blue *= 0.9;
-    } else {
-	color->red *= 1.25;
-	color->green *= 1.25;
-	color->blue *= 1.25;
-    }
-
-    color->red = CLAMP_COLOR (color->red);
-    color->green = CLAMP_COLOR (color->green);
-    color->blue = CLAMP_COLOR (color->blue);
-}
-#endif

=== removed file 'libcore/eel-gdk-extensions.h'
--- libcore/eel-gdk-extensions.h	2011-05-07 19:35:56 +0000
+++ libcore/eel-gdk-extensions.h	1970-01-01 00:00:00 +0000
@@ -1,57 +0,0 @@
-/* eel-gdk-extensions.h: Graphics routines to augment what's in gdk.
- *
- * Copyright (C) 1999, 2000 Eazel, Inc.
- *
- * The Gnome Library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2 of the
- * License, or (at your option) any later version.
- *
- * The Gnome Library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with the Gnome Library; see the file COPYING.LIB.  If not,
- * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- * Boston, MA 02111-1307, USA.
- *
- * Authors: Darin Adler <[e-mail]>,
- *          Ramiro Estrugo <[e-mail]>
- */
-
-#ifndef EEL_GDK_EXTENSIONS_H
-#define EEL_GDK_EXTENSIONS_H
-
-#include <gdk/gdk.h>
-
-/* Bits returned by eel_gdk_parse_geometry */
-typedef enum {
-    EEL_GDK_NO_VALUE     = 0x00,
-    EEL_GDK_X_VALUE      = 0x01,
-    EEL_GDK_Y_VALUE      = 0x02,
-    EEL_GDK_WIDTH_VALUE  = 0x04,
-    EEL_GDK_HEIGHT_VALUE = 0x08,
-    EEL_GDK_ALL_VALUES   = 0x0f,
-    EEL_GDK_X_NEGATIVE   = 0x10,
-    EEL_GDK_Y_NEGATIVE   = 0x20
-} EelGdkGeometryFlags;
-
-//gboolean            eel_gdk_rgba_is_dark                   (const GdkRGBA       *color);
-
-/* Wrapper for XParseGeometry */
-EelGdkGeometryFlags eel_gdk_parse_geometry                 (const char          *string,
-							    int                 *x_return,
-							    int                 *y_return,
-							    guint               *width_return,
-							    guint               *height_return);
-/*void                eel_cairo_draw_layout_with_drop_shadow (cairo_t             *cr,
-							    GdkRGBA            *text_color,
-							    GdkRGBA            *shadow_color,
-							    int                  x,
-							    int                  y,
-							    PangoLayout         *layout);
-void                eel_make_color_inactive                (GdkRGBA             *color);*/
-
-#endif /* EEL_GDK_EXTENSIONS_H */

=== modified file 'libcore/eel-gtk-extensions.c'
--- libcore/eel-gtk-extensions.c	2013-08-10 20:20:23 +0000
+++ libcore/eel-gtk-extensions.c	2014-04-26 02:25:06 +0000
@@ -104,76 +104,6 @@
     *height = MIN (*height, gdk_screen_height());
 }
 
-/**
- * eel_gtk_window_set_initial_geometry:
- *
- * Sets the position and size of a GtkWindow before the
- * GtkWindow is shown. It is an error to call this on a window that
- * is already on-screen. Takes into account screen size, and does
- * some sanity-checking on the passed-in values.
- * If no originals coordinates are given the window would be centered
- *
- * @window: A non-visible GtkWindow
- * @geometry_flags: A EelGdkGeometryFlags value defining which of
- * the following parameters have defined values
- * @left: pixel coordinate for left of window
- * @top: pixel coordinate for top of window
- * @width: width of window in pixels
- * @height: height of window in pixels
- */
-void
-eel_gtk_window_set_initial_geometry (GtkWindow *window,
-                                     EelGdkGeometryFlags geometry_flags,
-                                     int left,
-                                     int top,
-                                     guint width,
-                                     guint height)
-{
-    GdkScreen *screen;
-    int real_left, real_top;
-    int screen_width, screen_height;
-
-    g_return_if_fail (GTK_IS_WINDOW (window));
-
-    /* Setting the default size doesn't work when the window is already showing.
-     * Someday we could make this move an already-showing window, but we don't
-     * need that functionality yet.
-     */
-    g_return_if_fail (!gtk_widget_get_visible (GTK_WIDGET (window)));
-
-    if ((geometry_flags & EEL_GDK_X_VALUE) && (geometry_flags & EEL_GDK_Y_VALUE)) {
-        real_left = left;
-        real_top = top;
-
-        screen = gtk_window_get_screen (window);
-        screen_width  = gdk_screen_get_width  (screen);
-        screen_height = gdk_screen_get_height (screen);
-
-        /* This is sub-optimal. GDK doesn't allow us to set win_gravity
-         * to South/East types, which should be done if using negative
-         * positions (so that the right or bottom edge of the window
-         * appears at the specified position, not the left or top).
-         * However it does seem to be consistent with other GNOME apps.
-         */
-        if (geometry_flags & EEL_GDK_X_NEGATIVE) {
-            real_left = screen_width - real_left;
-        }
-        if (geometry_flags & EEL_GDK_Y_NEGATIVE) {
-            real_top = screen_height - real_top;
-        }
-
-        sanity_check_window_position (&real_left, &real_top);
-        gtk_window_move (window, real_left, real_top);
-    } else {
-        if (left == -1 && top == -1) {
-            /* no position coordinates found, let's center the window */
-            gtk_window_set_position (window, GTK_WIN_POS_CENTER);
-        }
-    }
-
-    sanity_check_window_dimensions (&width, &height);
-    gtk_window_set_default_size (GTK_WINDOW (window), (int)width, (int)height);
-}
 
 /**
  * eel_gtk_window_set_initial_geometry_from_string:
@@ -199,10 +129,6 @@
                                                  guint minimum_height,
                                                  gboolean ignore_position)
 {
-    int left, top;
-    guint width, height;
-    EelGdkGeometryFlags geometry_flags;
-
     g_return_if_fail (GTK_IS_WINDOW (window));
     g_return_if_fail (geometry_string != NULL);
 
@@ -212,22 +138,27 @@
      */
     g_return_if_fail (!gtk_widget_get_visible (GTK_WIDGET (window)));
 
-    width = height = 0;
-    left = top = -1;
-    geometry_flags = eel_gdk_parse_geometry (geometry_string, &left, &top, &width, &height);
-
-    /* Make sure the window isn't smaller than makes sense for this window.
-     * Other sanity checks are performed in set_initial_geometry.
-     */
-    width = MAX (width, minimum_width);
+    if( !gtk_window_parse_geometry (window, geometry_string) ){
+      g_print ("%s geometry set failed %s", G_STRFUNC, geometry_string);  
+    }
+    guint width,height,left,top;
+    gtk_window_get_size (window, &width, &height);
+    gtk_window_get_position (window, &left, &top);
+    
+    /*Use reasonable sizes*/
+    width  = MAX (width, minimum_width);
     height = MAX (height, minimum_height);
-
-    /* Ignore saved window position if requested. */
-    if (ignore_position) {
-        geometry_flags &= ~(EEL_GDK_X_VALUE | EEL_GDK_Y_VALUE);
+    
+    /*this saves the configuration*/
+    gtk_window_set_default_size (window, width, height);
+    
+    /* Ignore saved window position if requested or if it's off by too much*/
+    if ( ignore_position
+        || (gdk_screen_width()  < (left + width - MINIMUM_ON_SCREEN_WIDTH))
+        || (gdk_screen_height() < (top + height - MINIMUM_ON_SCREEN_HEIGHT)) ){
+        
+        gtk_window_move (window, 0,0);
     }
-
-    eel_gtk_window_set_initial_geometry (window, geometry_flags, left, top, width, height);
 }
 
 GtkMenuItem *

=== modified file 'libcore/eel-gtk-extensions.h'
--- libcore/eel-gtk-extensions.h	2013-08-10 20:20:23 +0000
+++ libcore/eel-gtk-extensions.h	2014-04-26 02:25:06 +0000
@@ -27,7 +27,6 @@
 #define EEL_GTK_EXTENSIONS_H
 
 #include <gtk/gtk.h>
-#include "eel-gdk-extensions.h"
 
 #define EEL_DEFAULT_POPUP_MENU_DISPLACEMENT 	2
 
@@ -38,13 +37,6 @@
 							     guint minimum_height,
 							     gboolean ignore_position);
 
-void	    eel_gtk_window_set_initial_geometry (GtkWindow *window,
-						 EelGdkGeometryFlags geometry_flags,
-						 int left,
-						 int top,
-						 guint width,
-						 guint height);
-
 //void    eel_gtk_adjustment_set_value (GtkAdjustment *adjustment, float value);
 GtkMenuItem *eel_gtk_menu_append_separator (GtkMenu *menu);
 

=== modified file 'libwidgets/tests/CMakeLists.txt'
--- libwidgets/tests/CMakeLists.txt	2014-01-24 18:36:41 +0000
+++ libwidgets/tests/CMakeLists.txt	2014-04-26 02:25:06 +0000
@@ -22,6 +22,6 @@
 add_executable(widgets-test ${VALA_C})
 
 link_directories(${DEPS_LIBRARY_DIRS})
-target_link_libraries(widgets-test marlinwidgets ${DEPS_LIBRARIES})
+target_link_libraries(widgets-test marlinwidgets ${DEPS_LIBRARIES} m)
 add_dependencies(widgets-test marlinwidgets)
 add_test_executable(widgets-test)
\ No newline at end of file

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2014-04-20 11:28:04 +0000
+++ src/CMakeLists.txt	2014-04-26 02:25:06 +0000
@@ -16,6 +16,7 @@
     granite>=0.3.0
     glib-2.0>=2.29.0
     gthread-2.0
+    gmodule-2.0
     gio-2.0
     gio-unix-2.0
     pango>=1.1.2
@@ -164,7 +165,7 @@
     marlin-connect-server-dialog.c
     ${VALA_C} )
 
-target_link_libraries (../pantheon-files m marlincore marlinwidgets ${DEPS_LIBRARIES})
+target_link_libraries (../pantheon-files  marlincore marlinwidgets ${DEPS_LIBRARIES} m)
 add_dependencies (../pantheon-files marlincore marlinwidgets)
 
 IF (WITH_UNITY AND UNITY_FOUND)

=== modified file 'src/fm-columns-view.c'
--- src/fm-columns-view.c	2014-03-24 20:34:55 +0000
+++ src/fm-columns-view.c	2014-04-26 02:25:06 +0000
@@ -734,7 +734,7 @@
                                    GtkTreePath     **end_path)
 
 {
-    g_return_if_fail (FM_IS_COLUMNS_VIEW (view));
+    g_return_val_if_fail (FM_IS_COLUMNS_VIEW (view), FALSE);
     return gtk_tree_view_get_visible_range (FM_COLUMNS_VIEW (view)->tree,
                                             start_path, end_path);
 }
@@ -855,4 +855,3 @@
     fm_directory_view_class->zoom_normal = fm_columns_view_zoom_normal;
     fm_directory_view_class->zoom_level_changed = fm_columns_view_zoom_level_changed;
 }
-

=== modified file 'src/fm-directory-view.c'
--- src/fm-directory-view.c	2014-04-18 00:56:20 +0000
+++ src/fm-directory-view.c	2014-04-26 02:25:06 +0000
@@ -2204,7 +2204,7 @@
     }
 
     /* Open */
-    GList *selection;
+    GList *selection = NULL;
     const char *menu_path = "/MenuBar/File/Open Placeholder/Open With/Applications Placeholder";
     const char *popup_path = "/background/Open Placeholder/Open With/Applications Placeholder";
 
@@ -4031,4 +4031,4 @@
     //view->details->templates_invalid = TRUE;
 
     update_menus (view);
-}
\ No newline at end of file
+}

=== modified file 'src/fm-directory-view.h'
--- src/fm-directory-view.h	2014-02-08 20:15:12 +0000
+++ src/fm-directory-view.h	2014-04-26 02:25:06 +0000
@@ -406,6 +406,7 @@
 void    fm_directory_view_add_subdirectory (FMDirectoryView *view, GOFDirectoryAsync *directory);
 void    fm_directory_view_remove_subdirectory (FMDirectoryView *view, GOFDirectoryAsync *directory);
 void    fm_directory_view_column_add_location (FMDirectoryView *dview, GFile *location);
+void    fm_directory_view_add_to_selection_gof_file (FMDirectoryView *view, GOFFile *file);
 void    fm_directory_view_load_location (FMDirectoryView *directory_view, GFile *location);
 void    fm_directory_view_activate_selected_items (FMDirectoryView *view, MarlinViewWindowOpenFlags flags);
 void    fm_directory_view_preview_selected_items (FMDirectoryView *view);
@@ -440,5 +441,5 @@
 void    fm_directory_view_select_first_for_empty_selection (FMDirectoryView *view);
 void    fm_directory_view_select_gof_file (FMDirectoryView *view, GOFFile *file);
 void    fm_directory_view_select_glib_files (FMDirectoryView *view, GList *files);
-
+void    prepare_to_select_added_files (FMDirectoryView *view);
 #endif /* FM_DIRECTORY_VIEW_H */

=== modified file 'src/fm-list-view.c'
--- src/fm-list-view.c	2014-03-24 20:34:55 +0000
+++ src/fm-list-view.c	2014-04-26 02:25:06 +0000
@@ -858,7 +858,7 @@
                                 GtkTreePath     **end_path)
 
 {
-    g_return_if_fail (FM_IS_LIST_VIEW (view));
+    g_return_val_if_fail (FM_IS_LIST_VIEW (view), FALSE);
     return gtk_tree_view_get_visible_range (FM_LIST_VIEW (view)->tree,
                                             start_path, end_path);
 }
@@ -991,4 +991,3 @@
     fm_directory_view_class->zoom_normal = fm_list_view_zoom_normal;
     fm_directory_view_class->zoom_level_changed = fm_list_view_zoom_level_changed;
 }
-