← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libnautilus-private/nautilus-merged-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-merged-directory.c
30
30
#include "nautilus-directory-notify.h"
31
31
#include "nautilus-file.h"
32
32
#include <eel/eel-glib-extensions.h>
33
 
#include <eel/eel-gtk-macros.h>
34
33
#include <gtk/gtk.h>
35
34
 
36
35
struct NautilusMergedDirectoryDetails {
69
68
 
70
69
G_DEFINE_TYPE (NautilusMergedDirectory, nautilus_merged_directory,
71
70
               NAUTILUS_TYPE_DIRECTORY);
72
 
#define parent_class nautilus_merged_directory_parent_class
73
71
 
74
72
static guint
75
73
merged_callback_hash (gconstpointer merged_callback_as_pointer)
414
412
                                                 nautilus_directory_get_file_list (cur_dir));
415
413
        }
416
414
 
417
 
        merged_dir_file_list = EEL_CALL_PARENT_WITH_RETURN_VALUE
418
 
                                (NAUTILUS_DIRECTORY_CLASS, get_file_list, (directory));
 
415
        merged_dir_file_list = NAUTILUS_DIRECTORY_CLASS 
 
416
                (nautilus_merged_directory_parent_class)->get_file_list (directory);
419
417
 
420
418
        return g_list_concat (dirs_file_list, merged_dir_file_list);
421
419
}
640
638
        g_hash_table_destroy (merged->details->monitors);
641
639
        nautilus_directory_list_free (merged->details->directories);
642
640
        g_list_free (merged->details->directories_not_done_loading);
643
 
        g_free (merged->details);
644
641
 
645
 
        G_OBJECT_CLASS (parent_class)->finalize (object);
 
642
        G_OBJECT_CLASS (nautilus_merged_directory_parent_class)->finalize (object);
646
643
}
647
644
 
648
645
static void
649
646
nautilus_merged_directory_init (NautilusMergedDirectory *merged)
650
647
{
651
 
        merged->details = g_new0 (NautilusMergedDirectoryDetails, 1);
 
648
        merged->details = G_TYPE_INSTANCE_GET_PRIVATE (merged, NAUTILUS_TYPE_MERGED_DIRECTORY,
 
649
                                                       NautilusMergedDirectoryDetails);
652
650
        merged->details->callbacks = g_hash_table_new
653
651
                (merged_callback_hash, merged_callback_equal);
654
652
        merged->details->monitors = g_hash_table_new (NULL, NULL);
679
677
        class->add_real_directory = merged_add_real_directory;
680
678
        class->remove_real_directory = merged_remove_real_directory;
681
679
 
 
680
        g_type_class_add_private (class, sizeof (NautilusMergedDirectoryDetails));
 
681
 
682
682
        signals[ADD_REAL_DIRECTORY] 
683
683
                = g_signal_new ("add_real_directory",
684
684
                                G_TYPE_FROM_CLASS (class),