← Back to branch summary

~ubuntu-branches/ubuntu/raring/nautilus/raring

« back to all changes in this revision

Viewing changes to src/nautilus-list-view.c

  • Committer: Package Import Robot
  • Author(s): Sebastien Bacher, Jeremy Bicha
  • Date: 2012-01-31 13:45:01 UTC
  • mfrom: (1.17.25)
  • Revision ID: package-import@ubuntu.com-20120131134501-yn7mqny7fgzx9fao
Tags: 1:3.3.4-0ubuntu1
https://launchpad.net/bugs/126540
https://launchpad.net/bugs/61786
https://launchpad.net/bugs/503330
https://launchpad.net/bugs/846289
https://launchpad.net/bugs/575719
https://launchpad.net/bugs/230098
* New upstream version which fixes:
  - "Opening Popupmenu in Context of Folder with List-View impossible?"
    (lp: #126540)
  - "'Create folder in here' context menu option for nautilus" (lp: #61786)
  - the file count and the size count change in opposite direction.
    (lp: #503330)
  - the mounts in the place menu should have a properties entry.
    (lp: #846289)
  - add command line option to select file (lp: #575719)
  - Media in 'Places' side bar should have same context menu as in 
    'Computer' (lp: #230098)
* debian/nautilus-data.install:
  - updated, ui and icons have been moved into gresources
* debian/patches/05_desktop_menu_export.patch:
   - updated to correctly include the gresources desktop definition

[ Jeremy Bicha ]
* New upstream release.
* debian/control.in:
  - Bump minimum GTK and glib
* Refreshed patches
* Dropped upstream patches:
  - 17_dont_allow_new_tab_on_desktop.patch
  - 18_fix_crash_in_get_current_uri.patch
  - 19_lazily_initialize_notification_service.patch
  - git_sideplace_sorting.patch
  - git_next_row.patch
  - git_dont_document_browser_option.patch
  - git_browser_compat.patch
  - git_bookmarks_reordering.patch
  - git_listview_context_menus.patch
  - git_use_gtk_grid.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/nautilus-list-view.c
37
37
#include <eel/eel-vfs-extensions.h>
38
38
#include <eel/eel-gdk-extensions.h>
39
39
#include <eel/eel-glib-extensions.h>
40
 
#include <eel/eel-gtk-macros.h>
41
40
#include <gdk/gdk.h>
42
41
#include <gdk/gdkkeysyms.h>
43
42
#include <gtk/gtk.h>
158
157
        "name", "size", "type", "trashed_on", "trash_orig_path", NULL
159
158
};
160
159
 
161
 
/* for EEL_CALL_PARENT */
162
 
#define parent_class nautilus_list_view_parent_class
163
 
 
164
 
 
165
160
static const gchar*
166
161
get_default_sort_order (NautilusFile *file, gboolean *reversed)
167
162
{
2200
2195
                return uri;
2201
2196
        }
2202
2197
 
2203
 
        return EEL_CALL_PARENT_WITH_RETURN_VALUE (NAUTILUS_VIEW_CLASS,
2204
 
                                                  get_backing_uri, (view));
 
2198
        return NAUTILUS_VIEW_CLASS (nautilus_list_view_parent_class)->get_backing_uri (view);
2205
2199
}
2206
2200
 
2207
2201
static void
2665
2659
        NautilusListView *list_view;
2666
2660
        GtkUIManager *ui_manager;
2667
2661
        GtkActionGroup *action_group;
2668
 
        const char *ui;
2669
 
 
2670
 
        EEL_CALL_PARENT (NAUTILUS_VIEW_CLASS, merge_menus, (view));
2671
2662
 
2672
2663
        list_view = NAUTILUS_LIST_VIEW (view);
2673
2664
 
 
2665
        NAUTILUS_VIEW_CLASS (nautilus_list_view_parent_class)->merge_menus (view);
 
2666
 
2674
2667
        ui_manager = nautilus_view_get_ui_manager (view);
2675
2668
 
2676
2669
        action_group = gtk_action_group_new ("ListViewActions");
2683
2676
        gtk_ui_manager_insert_action_group (ui_manager, action_group, 0);
2684
2677
        g_object_unref (action_group); /* owned by ui manager */
2685
2678
 
2686
 
        ui = nautilus_ui_string_get ("nautilus-list-view-ui.xml");
2687
 
        list_view->details->list_merge_id = gtk_ui_manager_add_ui_from_string (ui_manager, ui, -1, NULL);
 
2679
        list_view->details->list_merge_id =
 
2680
                gtk_ui_manager_add_ui_from_resource (ui_manager, "/org/gnome/nautilus/nautilus-list-view-ui.xml", NULL);
2688
2681
 
2689
2682
        list_view->details->menus_ready = TRUE;
2690
2683
}
2719
2712
                return;
2720
2713
        }
2721
2714
 
2722
 
        EEL_CALL_PARENT (NAUTILUS_VIEW_CLASS, update_menus, (view));
 
2715
        NAUTILUS_VIEW_CLASS (nautilus_list_view_parent_class)->update_menus (view);
2723
2716
}
2724
2717
 
2725
2718
/* Reset sort criteria and zoom level to match defaults */
3103
3096
                list_view->details->clipboard_handler_id = 0;
3104
3097
        }
3105
3098
 
3106
 
        G_OBJECT_CLASS (parent_class)->dispose (object);
 
3099
        G_OBJECT_CLASS (nautilus_list_view_parent_class)->dispose (object);
3107
3100
}
3108
3101
 
3109
3102
static void
3152
3145
                                              default_column_order_changed_callback,
3153
3146
                                              list_view);
3154
3147
 
3155
 
        G_OBJECT_CLASS (parent_class)->finalize (object);
 
3148
        G_OBJECT_CLASS (nautilus_list_view_parent_class)->finalize (object);
3156
3149
}
3157
3150
 
3158
3151
static char *