|
1
|
|
-diff --git a/configure.ac b/configure.ac
|
|
2
|
|
-index a41e815..6448195 100644
|
|
3
|
|
---- a/configure.ac
|
|
4
|
|
-+++ b/configure.ac
|
|
5
|
|
-@@ -41,6 +41,15 @@ PKG_CHECK_MODULES(GIO_UNIX, gio-unix-2.0 >= 2.50.0)
|
|
6
|
|
- AC_SUBST(GIO_UNIX_CFLAGS)
|
|
7
|
|
- AC_SUBST(GIO_UNIX_LIBS)
|
|
8
|
|
-
|
|
9
|
|
-+AC_ARG_ENABLE(collection,
|
|
10
|
|
-+ AC_HELP_STRING([--enable-collection],
|
|
11
|
|
-+ [enable collection menu entry]),,
|
|
12
|
|
-+ enable_collection=yes)
|
|
13
|
|
-+
|
|
14
|
|
-+if test x$enable_collection = xyes; then
|
|
15
|
|
-+ AC_DEFINE(WITH_COLLECTION,1,[Build with collection menu entry support])
|
|
16
|
|
-+fi
|
|
17
|
|
-+
|
|
18
|
|
- AC_ARG_ENABLE(deprecation_flags,
|
|
19
|
|
- [AC_HELP_STRING([--enable-deprecation-flags],
|
|
20
|
|
- [use *_DISABLE_DEPRECATED flags @<:@default=no@:>@])],,
|
|
21
|
|
-@@ -102,6 +111,7 @@ echo "
|
|
22
|
|
- Use *_DISABLE_DEPRECATED: ${enable_deprecation_flags}
|
|
23
|
|
-
|
|
24
|
|
- Turn on debugging: ${ax_enable_debug}
|
|
25
|
|
-+ Collection menu entry: ${enable_collection}
|
|
26
|
|
- Build introspection support: ${found_introspection}
|
|
27
|
|
- Native Language support: ${USE_NLS}
|
|
28
|
|
-
|
|
29
|
|
-diff --git a/libmenu/matemenu-tree.c b/libmenu/matemenu-tree.c
|
|
30
|
|
-index a66b567..88d933d 100644
|
|
31
|
|
---- a/libmenu/matemenu-tree.c
|
|
32
|
|
-+++ b/libmenu/matemenu-tree.c
|
|
33
|
|
-@@ -48,6 +48,7 @@ enum {
|
|
34
|
|
- PROP_FLAGS
|
|
35
|
|
- };
|
|
36
|
|
-
|
|
37
|
|
-+#ifdef WITH_COLLECTION
|
|
38
|
|
- typedef enum
|
|
39
|
|
- {
|
|
40
|
|
- OBJECT_DRAWER,
|
|
41
|
|
-@@ -58,6 +59,7 @@ typedef enum
|
|
42
|
|
- OBJECT_MENU_BAR,
|
|
43
|
|
- OBJECT_SEPARATOR,
|
|
44
|
|
- } ObjectType;
|
|
45
|
|
-+#endif /* WITH_COLLECTION */
|
|
46
|
|
-
|
|
47
|
|
- /* Signals */
|
|
48
|
|
- enum
|
|
49
|
|
-@@ -76,7 +78,12 @@ struct _MateMenuTree
|
|
50
|
|
- char *non_prefixed_basename;
|
|
51
|
|
- char *path;
|
|
52
|
|
- char *canonical_path;
|
|
53
|
|
-+
|
|
54
|
|
-+#ifdef WITH_COLLECTION
|
|
55
|
|
- GPtrArray *collection_applet;
|
|
56
|
|
-+ GSettings *settings;
|
|
57
|
|
-+#endif /* WITH_COLLECTION */
|
|
58
|
|
-+
|
|
59
|
|
- MateMenuTreeFlags flags;
|
|
60
|
|
-
|
|
61
|
|
- GSList *menu_file_monitors;
|
|
62
|
|
-@@ -87,7 +94,6 @@ struct _MateMenuTree
|
|
63
|
|
-
|
|
64
|
|
- guint canonical : 1;
|
|
65
|
|
- guint loaded : 1;
|
|
66
|
|
-- GSettings *settings;
|
|
67
|
|
- };
|
|
68
|
|
-
|
|
69
|
|
- G_DEFINE_TYPE (MateMenuTree, matemenu_tree, G_TYPE_OBJECT)
|
|
70
|
|
-@@ -180,9 +186,11 @@ static void matemenu_tree_invoke_monitors (MateMenuTree *tree);
|
|
71
|
|
-
|
|
72
|
|
- static void matemenu_tree_item_unref_and_unset_parent (gpointer itemp);
|
|
73
|
|
-
|
|
74
|
|
-+#ifdef WITH_COLLECTION
|
|
75
|
|
- static void collection_applet_changed (GSettings *settings,
|
|
76
|
|
- gchar *key,
|
|
77
|
|
- MateMenuTree *self);
|
|
78
|
|
-+#endif /* WITH_COLLECTION */
|
|
79
|
|
-
|
|
80
|
|
- typedef enum
|
|
81
|
|
- {
|
|
82
|
|
-@@ -636,20 +644,26 @@ matemenu_tree_finalize (GObject *object)
|
|
83
|
|
-
|
|
84
|
|
- g_hash_table_destroy (tree->entries_by_id);
|
|
85
|
|
- tree->entries_by_id = NULL;
|
|
86
|
|
-+
|
|
87
|
|
-+#ifdef WITH_COLLECTION
|
|
88
|
|
- if (tree->collection_applet != NULL)
|
|
89
|
|
- {
|
|
90
|
|
- g_ptr_array_foreach (tree->collection_applet, (GFunc) g_free, NULL);
|
|
91
|
|
- g_ptr_array_free (tree->collection_applet, TRUE);
|
|
92
|
|
- tree->collection_applet = NULL;
|
|
93
|
|
- }
|
|
94
|
|
-+
|
|
95
|
|
- g_signal_handlers_disconnect_by_func (tree->settings,
|
|
96
|
|
- G_CALLBACK (collection_applet_changed),
|
|
97
|
|
- tree);
|
|
98
|
|
-
|
|
99
|
|
- g_object_unref (tree->settings);
|
|
100
|
|
-+# endif /* WITH_COLLECTION */
|
|
101
|
|
-+
|
|
102
|
|
- G_OBJECT_CLASS (matemenu_tree_parent_class)->finalize (object);
|
|
103
|
|
- }
|
|
104
|
|
-
|
|
105
|
|
-+#ifdef WITH_COLLECTION
|
|
106
|
|
- static void
|
|
107
|
|
- load_object (char *id,
|
|
108
|
|
- MateMenuTree *self)
|
|
109
|
|
-@@ -726,17 +740,20 @@ collection_applet_changed (GSettings *settings,
|
|
110
|
|
- get_panel_collection_applet (self);
|
|
111
|
|
- g_idle_add (emit_changed_signal, (gpointer)self);
|
|
112
|
|
- }
|
|
113
|
|
-+# endif /* WITH_COLLECTION */
|
|
114
|
|
-
|
|
115
|
|
- static void
|
|
116
|
|
- matemenu_tree_init (MateMenuTree *self)
|
|
117
|
|
- {
|
|
118
|
|
- self->entries_by_id = g_hash_table_new (g_str_hash, g_str_equal);
|
|
119
|
|
-+#ifdef WITH_COLLECTION
|
|
120
|
|
- self->collection_applet = NULL;
|
|
121
|
|
- self->settings = g_settings_new ("org.mate.panel");
|
|
122
|
|
- get_panel_collection_applet (self);
|
|
123
|
|
- g_signal_connect (self->settings, "changed::object-id-list",
|
|
124
|
|
- G_CALLBACK (collection_applet_changed),
|
|
125
|
|
- self);
|
|
126
|
|
-+# endif /* WITH_COLLECTION */
|
|
127
|
|
- }
|
|
128
|
|
-
|
|
129
|
|
- static void
|
|
130
|
|
-@@ -1791,14 +1808,13 @@ matemenu_tree_entry_compare_by_id (MateMenuTreeItem *a,
|
|
131
|
|
- gpointer
|
|
132
|
|
- matemenu_tree_item_ref (gpointer itemp)
|
|
133
|
|
- {
|
|
134
|
|
-- MateMenuTreeItem* item = (MateMenuTreeItem*) itemp;
|
|
135
|
|
--
|
|
136
|
|
-- g_return_val_if_fail(item != NULL, NULL);
|
|
137
|
|
-- g_return_val_if_fail(item->refcount > 0, NULL);
|
|
138
|
|
-+ MateMenuTreeItem* item = (MateMenuTreeItem*) itemp;
|
|
139
|
|
-+ g_return_val_if_fail(item != NULL || *item != NULL, NULL);
|
|
140
|
|
-+ g_return_val_if_fail(item->refcount > 0, NULL);
|
|
141
|
|
-
|
|
142
|
|
- g_atomic_int_inc (&item->refcount);
|
|
143
|
|
-
|
|
144
|
|
-- return item;
|
|
145
|
|
-+ return item;
|
|
146
|
|
- }
|
|
147
|
|
-
|
|
148
|
|
- void
|
|
149
|
|
-@@ -3244,6 +3260,7 @@ get_by_category_foreach (const char *file_id,
|
|
150
|
|
- desktop_entry_set_add_entry (data->set, entry, file_id);
|
|
151
|
|
- }
|
|
152
|
|
-
|
|
153
|
|
-+#ifdef WITH_COLLECTION
|
|
154
|
|
- static void
|
|
155
|
|
- get_by_desktop_foreach (const char *file_id,
|
|
156
|
|
- DesktopEntry *entry,
|
|
157
|
|
-@@ -3252,6 +3269,7 @@ get_by_desktop_foreach (const char *file_id,
|
|
158
|
|
- if (g_strcmp0 (file_id, data->category) == 0)
|
|
159
|
|
- desktop_entry_set_add_entry (data->set, entry, file_id);
|
|
160
|
|
- }
|
|
161
|
|
-+#endif /* WITH_COLLECTION */
|
|
162
|
|
-
|
|
163
|
|
- static void
|
|
164
|
|
- get_by_category (DesktopEntrySet *entry_pool,
|
|
165
|
|
-@@ -3268,6 +3286,7 @@ get_by_category (DesktopEntrySet *entry_pool,
|
|
166
|
|
- &data);
|
|
167
|
|
- }
|
|
168
|
|
-
|
|
169
|
|
-+#ifdef WITH_COLLECTION
|
|
170
|
|
- static void
|
|
171
|
|
- get_by_desktop (DesktopEntrySet *entry_pool,
|
|
172
|
|
- DesktopEntrySet *set,
|
|
173
|
|
-@@ -3282,6 +3301,7 @@ get_by_desktop (DesktopEntrySet *entry_pool,
|
|
174
|
|
- (DesktopEntrySetForeachFunc) get_by_desktop_foreach,
|
|
175
|
|
- &data);
|
|
176
|
|
- }
|
|
177
|
|
-+#endif /* WITH_COLLECTION */
|
|
178
|
|
-
|
|
179
|
|
- static DesktopEntrySet *
|
|
180
|
|
- process_include_rules (MenuLayoutNode *layout,
|
|
181
|
|
-@@ -3791,6 +3811,8 @@ process_layout (MateMenuTree *tree,
|
|
182
|
|
- matemenu_tree_item_unref (directory);
|
|
183
|
|
- return NULL;
|
|
184
|
|
- }
|
|
185
|
|
-+
|
|
186
|
|
-+#ifdef WITH_COLLECTION
|
|
187
|
|
- if (tree->collection_applet && !g_strcmp0 (directory->name, "Collection"))
|
|
188
|
|
- {
|
|
189
|
|
- guint i;
|
|
190
|
|
-@@ -3800,6 +3822,7 @@ process_layout (MateMenuTree *tree,
|
|
191
|
|
- get_by_desktop (entry_pool, entries, desktop_name);
|
|
192
|
|
- }
|
|
193
|
|
- }
|
|
194
|
|
-+#endif /* WITH_COLLECTION */
|
|
195
|
|
-
|
|
196
|
|
- desktop_entry_set_foreach (entries,
|
|
197
|
|
- (DesktopEntrySetForeachFunc) entries_listify_foreach, |