diff options
author | Carlos Soriano <csoriano@gnome.org> | 2016-03-09 01:36:44 +0100 |
---|---|---|
committer | Carlos Soriano <csoriano@gnome.org> | 2016-03-09 17:15:07 +0100 |
commit | 0fec6f28c91c12b7d7d264c296986de74fca23f6 (patch) | |
tree | 033eb61f1438857dbdf667f61f14e3660fb12736 /src/nautilus-places-view.c | |
parent | 3bf5fcfc89de5c3245034ee4752392fe42291924 (diff) | |
download | nautilus-0fec6f28c91c12b7d7d264c296986de74fca23f6.tar.gz |
placesview: auto generate code
We have been manually copying the code inside nautilus since we
introduced the places view.
It has been a pain to maintain, mostly because we needed to remove the
bits that only work inside gtk+ and instead either remove them or make
a substitution. But that was doable.
However, it reached a new level when we realized that we use the file
chooser inside nautilus, for the "move to" and "copy to" actions, which
create makes symbols clash. So we needed to rename all the symbols in
those files.
Instead of making it manually, create a shell script that fetches gtk+
repository and make the appropriate substitutions, deletions and what
not.
https://bugzilla.gnome.org/show_bug.cgi?id=760307
Diffstat (limited to 'src/nautilus-places-view.c')
-rw-r--r-- | src/nautilus-places-view.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/nautilus-places-view.c b/src/nautilus-places-view.c index 9a7cd1feb..b80549023 100644 --- a/src/nautilus-places-view.c +++ b/src/nautilus-places-view.c @@ -20,7 +20,7 @@ #include "nautilus-places-view.h" #include "nautilus-window-slot.h" #include "nautilus-application.h" -#include "gtk/gtkplacesviewprivate.h" +#include "gtk/nautilusgtkplacesviewprivate.h" typedef struct { @@ -251,7 +251,7 @@ nautilus_places_view_set_search_query (NautilusView *view, text = query ? nautilus_query_get_text (query) : NULL; - gtk_nautilus_places_view_set_search_query (GTK_NAUTILUS_PLACES_VIEW (priv->places_view), text); + nautilus_gtk_places_view_set_search_query (NAUTILUS_GTK_PLACES_VIEW (priv->places_view), text); g_free (text); } @@ -270,7 +270,7 @@ nautilus_places_view_is_loading (NautilusView *view) priv = nautilus_places_view_get_instance_private (NAUTILUS_PLACES_VIEW (view)); - return gtk_nautilus_places_view_get_loading (GTK_NAUTILUS_PLACES_VIEW (priv->places_view)); + return nautilus_gtk_places_view_get_loading (NAUTILUS_GTK_PLACES_VIEW (priv->places_view)); } static gboolean @@ -329,8 +329,8 @@ nautilus_places_view_init (NautilusPlacesView *self) priv->location = g_file_new_for_uri ("other-locations:///"); /* Places view */ - priv->places_view = gtk_nautilus_places_view_new (); - gtk_nautilus_places_view_set_open_flags (GTK_NAUTILUS_PLACES_VIEW (priv->places_view), + priv->places_view = nautilus_gtk_places_view_new (); + nautilus_gtk_places_view_set_open_flags (NAUTILUS_GTK_PLACES_VIEW (priv->places_view), GTK_PLACES_OPEN_NEW_TAB | GTK_PLACES_OPEN_NEW_WINDOW | GTK_PLACES_OPEN_NORMAL); gtk_widget_set_hexpand (priv->places_view, TRUE); gtk_widget_set_vexpand (priv->places_view, TRUE); |