← Back to branch summary

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

« back to all changes in this revision

Viewing changes to libnautilus-private/nautilus-search-engine.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-search-engine.c
29
29
#include "nautilus-search-engine-tracker.h"
30
30
#endif
31
31
 
32
 
#include <eel/eel-gtk-macros.h>
33
 
 
34
 
struct NautilusSearchEngineDetails {
35
 
        int none;
36
 
};
37
 
 
38
32
enum {
39
33
        HITS_ADDED,
40
34
        HITS_SUBTRACTED,
45
39
 
46
40
static guint signals[LAST_SIGNAL];
47
41
 
48
 
static void  nautilus_search_engine_class_init       (NautilusSearchEngineClass *class);
49
 
static void  nautilus_search_engine_init             (NautilusSearchEngine      *engine);
50
 
 
51
 
G_DEFINE_ABSTRACT_TYPE (NautilusSearchEngine,
52
 
                        nautilus_search_engine,
 
42
G_DEFINE_ABSTRACT_TYPE (NautilusSearchEngine, nautilus_search_engine,
53
43
                        G_TYPE_OBJECT);
54
44
 
55
 
static GObjectClass *parent_class = NULL;
56
 
 
57
 
static void
58
 
finalize (GObject *object)
59
 
{
60
 
        NautilusSearchEngine *engine;
61
 
 
62
 
        engine = NAUTILUS_SEARCH_ENGINE (object);
63
 
        
64
 
        g_free (engine->details);
65
 
 
66
 
        EEL_CALL_PARENT (G_OBJECT_CLASS, finalize, (object));
67
 
}
68
 
 
69
45
static void
70
46
nautilus_search_engine_class_init (NautilusSearchEngineClass *class)
71
47
{
72
 
        GObjectClass *gobject_class;
73
 
 
74
 
        parent_class = g_type_class_peek_parent (class);
75
 
 
76
 
        gobject_class = G_OBJECT_CLASS (class);
77
 
        gobject_class->finalize = finalize;
78
 
 
79
48
        signals[HITS_ADDED] =
80
49
                g_signal_new ("hits-added",
81
50
                              G_TYPE_FROM_CLASS (class),
120
89
static void
121
90
nautilus_search_engine_init (NautilusSearchEngine *engine)
122
91
{
123
 
        engine->details = g_new0 (NautilusSearchEngineDetails, 1);
124
92
}
125
93
 
126
94
NautilusSearchEngine *