[Frugalware-darcs] frugalware-0.5: nautilus-2.16.0-1siwenna1-x86_64
AlexExtreme
alex at alex-smith.me.uk
Thu Sep 14 17:56:09 CEST 2006
Darcsweb-Url: http://darcs.frugalware.org/darcsweb/darcsweb.cgi?r=frugalware-0.5;a=darcs_commitdiff;h=20060914165321-46e39-5ea4a760e953ec55a9e9cc9774d763f65bcbca47.gz;
[nautilus-2.16.0-1siwenna1-x86_64
AlexExtreme <alex at alex-smith.me.uk>**20060914165321
* Backported from -current to fix some crasher bugs
] {
hunk ./source/gnome/nautilus/FrugalBuild 1
-# Last modified: Wed, 06 Sep 2006 21:07:59 +0200
+# Last modified: Thu, 14 Sep 2006 17:49:57 +0100
hunk ./source/gnome/nautilus/FrugalBuild 7
-pkgrel=1
+pkgrel=1siwenna1
hunk ./source/gnome/nautilus/FrugalBuild 18
-source=(${source[@]} $pkgname-2.15.91-frugalware_defaults.patch)
+source=(${source[@]} $pkgname-2.15.91-frugalware_defaults.patch $pkgname-$pkgver-fix-crasher.patch)
hunk ./source/gnome/nautilus/FrugalBuild 20
- '44ff986c6822978bdfc8d10c6378e60a8498ae96')
+ '44ff986c6822978bdfc8d10c6378e60a8498ae96' \
+ '32ec739f6b5e5ca24ffd24c40d1229988b821f50')
addfile ./source/gnome/nautilus/nautilus-2.16.0-fix-crasher.patch
hunk ./source/gnome/nautilus/nautilus-2.16.0-fix-crasher.patch 1
+diff --git a/src/nautilus-places-sidebar.c b/src/nautilus-places-sidebar.c
+index 17dc95b..0f9d6a0 100644
+--- a/src/nautilus-places-sidebar.c
++++ b/src/nautilus-places-sidebar.c
+@@ -128,12 +128,12 @@ enum {
+ };
+
+ /* Target types for dragging from the shortcuts list */
+-static const GtkTargetEntry shortcuts_source_targets[] = {
++static const GtkTargetEntry nautilus_shortcuts_source_targets[] = {
+ { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW }
+ };
+
+ /* Target types for dropping into the shortcuts list */
+-static const GtkTargetEntry shortcuts_drop_targets [] = {
++static const GtkTargetEntry nautilus_shortcuts_drop_targets [] = {
+ { "GTK_TREE_MODEL_ROW", GTK_TARGET_SAME_WIDGET, GTK_TREE_MODEL_ROW },
+ { "text/uri-list", 0, TEXT_URI_LIST }
+ };
+@@ -143,25 +143,25 @@ typedef struct {
+ GtkTreeModelFilter parent;
+
+ NautilusPlacesSidebar *sidebar;
+-} ShortcutsModelFilter;
++} NautilusShortcutsModelFilter;
+
+ typedef struct {
+ GtkTreeModelFilterClass parent_class;
+-} ShortcutsModelFilterClass;
++} NautilusShortcutsModelFilterClass;
+
+-#define SHORTCUTS_MODEL_FILTER_TYPE (_shortcuts_model_filter_get_type ())
+-#define SHORTCUTS_MODEL_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), SHORTCUTS_MODEL_FILTER_TYPE, ShortcutsModelFilter))
++#define NAUTILUS_SHORTCUTS_MODEL_FILTER_TYPE (_nautilus_shortcuts_model_filter_get_type ())
++#define NAUTILUS_SHORTCUTS_MODEL_FILTER(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), NAUTILUS_SHORTCUTS_MODEL_FILTER_TYPE, NautilusShortcutsModelFilter))
+
+-GType _shortcuts_model_filter_get_type (void);
+-static void shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface);
++GType _nautilus_shortcuts_model_filter_get_type (void);
++static void nautilus_shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface);
+
+-G_DEFINE_TYPE_WITH_CODE (ShortcutsModelFilter,
+- _shortcuts_model_filter,
++G_DEFINE_TYPE_WITH_CODE (NautilusShortcutsModelFilter,
++ _nautilus_shortcuts_model_filter,
+ GTK_TYPE_TREE_MODEL_FILTER,
+ G_IMPLEMENT_INTERFACE (GTK_TYPE_TREE_DRAG_SOURCE,
+- shortcuts_model_filter_drag_source_iface_init));
++ nautilus_shortcuts_model_filter_drag_source_iface_init));
+
+-static GtkTreeModel *shortcuts_model_filter_new (NautilusPlacesSidebar *sidebar,
++static GtkTreeModel *nautilus_shortcuts_model_filter_new (NautilusPlacesSidebar *sidebar,
+ GtkTreeModel *child_model,
+ GtkTreePath *root);
+
+@@ -383,7 +383,7 @@ update_places_cb (gpointer data)
+ }
+
+ static gboolean
+-shortcuts_row_separator_func (GtkTreeModel *model,
++nautilus_shortcuts_row_separator_func (GtkTreeModel *model,
+ GtkTreeIter *iter,
+ gpointer data)
+ {
+@@ -1512,7 +1512,7 @@ nautilus_places_sidebar_init (NautilusPl
+ G_CALLBACK (bookmarks_editing_canceled), sidebar);
+
+ gtk_tree_view_set_row_separator_func (tree_view,
+- shortcuts_row_separator_func,
++ nautilus_shortcuts_row_separator_func,
+ NULL,
+ NULL);
+
+@@ -1528,7 +1528,7 @@ nautilus_places_sidebar_init (NautilusPl
+ GDK_TYPE_PIXBUF,
+ G_TYPE_INT
+ );
+- sidebar->filter_model = shortcuts_model_filter_new (sidebar,
++ sidebar->filter_model = nautilus_shortcuts_model_filter_new (sidebar,
+ GTK_TREE_MODEL (sidebar->store),
+ NULL);
+
+@@ -1549,12 +1549,12 @@ nautilus_places_sidebar_init (NautilusPl
+
+ gtk_tree_view_enable_model_drag_source (GTK_TREE_VIEW (tree_view),
+ GDK_BUTTON1_MASK,
+- shortcuts_source_targets,
+- G_N_ELEMENTS (shortcuts_source_targets),
++ nautilus_shortcuts_source_targets,
++ G_N_ELEMENTS (nautilus_shortcuts_source_targets),
+ GDK_ACTION_MOVE);
+ gtk_drag_dest_set (GTK_WIDGET (tree_view),
+ 0,
+- shortcuts_drop_targets, G_N_ELEMENTS (shortcuts_drop_targets),
++ nautilus_shortcuts_drop_targets, G_N_ELEMENTS (nautilus_shortcuts_drop_targets),
+ GDK_ACTION_MOVE | GDK_ACTION_COPY | GDK_ACTION_LINK);
+
+ g_signal_connect (tree_view, "key-press-event",
+@@ -1731,27 +1731,27 @@ nautilus_places_sidebar_register (void)
+ /* Drag and drop interfaces */
+
+ static void
+-_shortcuts_model_filter_class_init (ShortcutsModelFilterClass *class)
++_nautilus_shortcuts_model_filter_class_init (NautilusShortcutsModelFilterClass *class)
+ {
+ }
+
+ static void
+-_shortcuts_model_filter_init (ShortcutsModelFilter *model)
++_nautilus_shortcuts_model_filter_init (NautilusShortcutsModelFilter *model)
+ {
+ model->sidebar = NULL;
+ }
+
+ /* GtkTreeDragSource::row_draggable implementation for the shortcuts filter model */
+ static gboolean
+-shortcuts_model_filter_row_draggable (GtkTreeDragSource *drag_source,
++nautilus_shortcuts_model_filter_row_draggable (GtkTreeDragSource *drag_source,
+ GtkTreePath *path)
+ {
+- ShortcutsModelFilter *model;
++ NautilusShortcutsModelFilter *model;
+ int pos;
+ int bookmarks_pos;
+ int num_bookmarks;
+
+- model = SHORTCUTS_MODEL_FILTER (drag_source);
++ model = NAUTILUS_SHORTCUTS_MODEL_FILTER (drag_source);
+
+ pos = *gtk_tree_path_get_indices (path);
+ bookmarks_pos = get_bookmark_index (model->sidebar->tree_view);
+@@ -1762,13 +1762,13 @@ shortcuts_model_filter_row_draggable (Gt
+
+ /* GtkTreeDragSource::drag_data_get implementation for the shortcuts filter model */
+ static gboolean
+-shortcuts_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
++nautilus_shortcuts_model_filter_drag_data_get (GtkTreeDragSource *drag_source,
+ GtkTreePath *path,
+ GtkSelectionData *selection_data)
+ {
+- ShortcutsModelFilter *model;
++ NautilusShortcutsModelFilter *model;
+
+- model = SHORTCUTS_MODEL_FILTER (drag_source);
++ model = NAUTILUS_SHORTCUTS_MODEL_FILTER (drag_source);
+
+ /* FIXME */
+
+@@ -1777,20 +1777,20 @@ shortcuts_model_filter_drag_data_get (Gt
+
+ /* Fill the GtkTreeDragSourceIface vtable */
+ static void
+-shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
++nautilus_shortcuts_model_filter_drag_source_iface_init (GtkTreeDragSourceIface *iface)
+ {
+- iface->row_draggable = shortcuts_model_filter_row_draggable;
+- iface->drag_data_get = shortcuts_model_filter_drag_data_get;
++ iface->row_draggable = nautilus_shortcuts_model_filter_row_draggable;
++ iface->drag_data_get = nautilus_shortcuts_model_filter_drag_data_get;
+ }
+
+ static GtkTreeModel *
+-shortcuts_model_filter_new (NautilusPlacesSidebar *sidebar,
++nautilus_shortcuts_model_filter_new (NautilusPlacesSidebar *sidebar,
+ GtkTreeModel *child_model,
+ GtkTreePath *root)
+ {
+- ShortcutsModelFilter *model;
++ NautilusShortcutsModelFilter *model;
+
+- model = g_object_new (SHORTCUTS_MODEL_FILTER_TYPE,
++ model = g_object_new (NAUTILUS_SHORTCUTS_MODEL_FILTER_TYPE,
+ "child-model", child_model,
+ "virtual-root", root,
+ NULL);
}
More information about the Frugalware-darcs
mailing list