← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libnautilus-private/nautilus-desktop-directory.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:
libnautilus-private/nautilus-desktop-directory.c
32
32
#include "nautilus-file-private.h"
33
33
#include "nautilus-file-utilities.h"
34
34
#include "nautilus-global-preferences.h"
35
 
#include <eel/eel-glib-extensions.h>
36
 
#include <eel/eel-gtk-macros.h>
37
35
#include <gtk/gtk.h>
38
36
 
39
37
struct NautilusDesktopDirectoryDetails {
66
64
 
67
65
G_DEFINE_TYPE (NautilusDesktopDirectory, nautilus_desktop_directory,
68
66
               NAUTILUS_TYPE_DIRECTORY);
69
 
#define parent_class nautilus_desktop_directory_parent_class
70
67
 
71
68
static gboolean
72
69
desktop_contains_file (NautilusDirectory *directory,
398
395
        
399
396
        real_dir_file_list = nautilus_directory_get_file_list
400
397
                                (NAUTILUS_DESKTOP_DIRECTORY (directory)->details->real_directory);
401
 
        desktop_dir_file_list = EEL_CALL_PARENT_WITH_RETURN_VALUE (NAUTILUS_DIRECTORY_CLASS, get_file_list, (directory));
 
398
        desktop_dir_file_list = NAUTILUS_DIRECTORY_CLASS (nautilus_desktop_directory_parent_class)->get_file_list (directory);
402
399
 
403
400
        return g_list_concat (real_dir_file_list, desktop_dir_file_list);
404
401
}