diff options
Diffstat (limited to 'libmenu')
| -rw-r--r-- | libmenu/entry-directories.c | 3 | ||||
| -rw-r--r-- | libmenu/matemenu-tree.c | 102 | ||||
| -rw-r--r-- | libmenu/menu-layout.c | 4 | ||||
| -rw-r--r-- | libmenu/menu-monitor.c | 3 | ||||
| -rw-r--r-- | libmenu/menu-util.c | 4 | ||||
| -rw-r--r-- | libmenu/meson.build | 72 |
6 files changed, 126 insertions, 62 deletions
diff --git a/libmenu/entry-directories.c b/libmenu/entry-directories.c index 2d608bc..3970c95 100644 --- a/libmenu/entry-directories.c +++ b/libmenu/entry-directories.c @@ -18,6 +18,9 @@ * Boston, MA 02110-1301, USA. */ +/* used for realpath() */ +#define _XOPEN_SOURCE 500 + #include <config.h> #include "entry-directories.h" diff --git a/libmenu/matemenu-tree.c b/libmenu/matemenu-tree.c index 9b47a65..0260a6d 100644 --- a/libmenu/matemenu-tree.c +++ b/libmenu/matemenu-tree.c @@ -18,6 +18,9 @@ * Boston, MA 02110-1301, USA. */ +/* used for realpath() */ +#define _XOPEN_SOURCE 500 + #include <config.h> #include "matemenu-tree.h" @@ -82,6 +85,7 @@ struct _MateMenuTree #ifdef WITH_COLLECTION GPtrArray *collection_applet; GSettings *settings; + guint emit_changed_signal; #endif /* WITH_COLLECTION */ MateMenuTreeFlags flags; @@ -648,7 +652,6 @@ matemenu_tree_finalize (GObject *object) #ifdef WITH_COLLECTION if (tree->collection_applet != NULL) { - g_ptr_array_foreach (tree->collection_applet, (GFunc) g_free, NULL); g_ptr_array_free (tree->collection_applet, TRUE); tree->collection_applet = NULL; } @@ -658,6 +661,9 @@ matemenu_tree_finalize (GObject *object) tree); g_object_unref (tree->settings); + if (tree->emit_changed_signal != 0) + g_source_remove (tree->emit_changed_signal); + tree->emit_changed_signal = 0; #endif /* WITH_COLLECTION */ G_OBJECT_CLASS (matemenu_tree_parent_class)->finalize (object); @@ -682,7 +688,7 @@ load_object (char *id, char *desktop_name; if (self->collection_applet == NULL) - self->collection_applet = g_ptr_array_new (); + self->collection_applet = g_ptr_array_new_with_free_func ((GDestroyNotify) g_free); location = g_settings_get_string (settings, "launcher-location"); desktop_name = g_path_get_basename (location); @@ -706,6 +712,8 @@ static gboolean emit_changed_signal (gpointer data) { MateMenuTree *self = data; + self->emit_changed_signal = 0; + matemenu_tree_force_rebuild (self); matemenu_tree_invoke_monitors (self); @@ -733,12 +741,12 @@ collection_applet_changed (GSettings *settings, { if (self->collection_applet != NULL) { - g_ptr_array_foreach (self->collection_applet, (GFunc) g_free, NULL); g_ptr_array_free (self->collection_applet, TRUE); self->collection_applet = NULL; } get_panel_collection_applet (self); - g_idle_add (emit_changed_signal, (gpointer)self); + if (self->emit_changed_signal == 0) + self->emit_changed_signal = g_idle_add (emit_changed_signal, (gpointer)self); } #endif /* WITH_COLLECTION */ @@ -753,6 +761,7 @@ matemenu_tree_init (MateMenuTree *self) g_signal_connect (self->settings, "changed::object-id-list", G_CALLBACK (collection_applet_changed), self); + self->emit_changed_signal = 0; #endif /* WITH_COLLECTION */ } @@ -1096,8 +1105,7 @@ matemenu_tree_iter_unref (MateMenuTreeIter *iter) if (!g_atomic_int_dec_and_test (&iter->refcount)) return; - g_slist_foreach (iter->contents, (GFunc)matemenu_tree_item_unref, NULL); - g_slist_free (iter->contents); + g_slist_free_full (iter->contents, (GDestroyNotify)matemenu_tree_item_unref); g_slice_free (MateMenuTreeIter, iter); } @@ -1606,34 +1614,24 @@ matemenu_tree_directory_finalize (MateMenuTreeDirectory *directory) { g_assert (directory->item.refcount == 0); - g_slist_foreach (directory->contents, - (GFunc) matemenu_tree_item_unref_and_unset_parent, - NULL); - g_slist_free (directory->contents); + g_slist_free_full (directory->contents, + (GDestroyNotify) matemenu_tree_item_unref_and_unset_parent); directory->contents = NULL; - g_slist_foreach (directory->default_layout_info, - (GFunc) menu_layout_node_unref, - NULL); - g_slist_free (directory->default_layout_info); + g_slist_free_full (directory->default_layout_info, + (GDestroyNotify) menu_layout_node_unref); directory->default_layout_info = NULL; - g_slist_foreach (directory->layout_info, - (GFunc) menu_layout_node_unref, - NULL); - g_slist_free (directory->layout_info); + g_slist_free_full (directory->layout_info, + (GDestroyNotify) menu_layout_node_unref); directory->layout_info = NULL; - g_slist_foreach (directory->subdirs, - (GFunc) matemenu_tree_item_unref_and_unset_parent, - NULL); - g_slist_free (directory->subdirs); + g_slist_free_full (directory->subdirs, + (GDestroyNotify) matemenu_tree_item_unref_and_unset_parent); directory->subdirs = NULL; - g_slist_foreach (directory->entries, - (GFunc) matemenu_tree_item_unref_and_unset_parent, - NULL); - g_slist_free (directory->entries); + g_slist_free_full (directory->entries, + (GDestroyNotify) matemenu_tree_item_unref_and_unset_parent); directory->entries = NULL; if (directory->directory_entry) @@ -1914,15 +1912,12 @@ matemenu_tree_item_compare_get_name_helper (MateMenuTreeItem *item, } static int -matemenu_tree_item_compare (MateMenuTreeItem *a, - MateMenuTreeItem *b, - gpointer flags_p) +matemenu_tree_item_compare (MateMenuTreeItem *a, + MateMenuTreeItem *b, + MateMenuTreeFlags flags) { const char *name_a; const char *name_b; - MateMenuTreeFlags flags; - - flags = GPOINTER_TO_INT (flags_p); name_a = matemenu_tree_item_compare_get_name_helper (a, flags); name_b = matemenu_tree_item_compare_get_name_helper (b, flags); @@ -2645,8 +2640,7 @@ add_menu_for_legacy_dir (MenuLayoutNode *parent, desktop_entry_set_unref (desktop_entries); - g_slist_foreach (subdirs, (GFunc) g_free, NULL); - g_slist_free (subdirs); + g_slist_free_full (subdirs, (GDestroyNotify) g_free); return menu_added; } @@ -4118,10 +4112,8 @@ preprocess_layout_info_subdir_helper (MateMenuTree *tree, alias = matemenu_tree_alias_new (directory, subdir, item); - g_slist_foreach (list, - (GFunc) matemenu_tree_item_unref_and_unset_parent, - NULL); - g_slist_free (list); + g_slist_free_full (list, + (GDestroyNotify) matemenu_tree_item_unref_and_unset_parent); subdir->subdirs = NULL; subdir->entries = NULL; @@ -4528,8 +4520,8 @@ merge_subdirs (MateMenuTree *tree, directory->subdirs = NULL; subdirs = g_slist_sort_with_data (subdirs, - (GCompareDataFunc) matemenu_tree_item_compare, - GINT_TO_POINTER (MATEMENU_TREE_FLAGS_NONE)); + (GCompareDataFunc) matemenu_tree_item_compare, + (void *) MATEMENU_TREE_FLAGS_NONE); tmp = subdirs; while (tmp != NULL) @@ -4574,7 +4566,7 @@ merge_entries (MateMenuTree *tree, entries = g_slist_sort_with_data (entries, (GCompareDataFunc) matemenu_tree_item_compare, - GINT_TO_POINTER (tree->flags)); + (void *) tree->flags); tmp = entries; while (tmp != NULL) @@ -4622,8 +4614,8 @@ merge_subdirs_and_entries (MateMenuTree *tree, directory->entries = NULL; items = g_slist_sort_with_data (items, - (GCompareDataFunc) matemenu_tree_item_compare, - GINT_TO_POINTER (tree->flags)); + (GCompareDataFunc) matemenu_tree_item_compare, + (void *) tree->flags); tmp = items; while (tmp != NULL) @@ -4841,28 +4833,20 @@ process_layout_info (MateMenuTree *tree, } } - g_slist_foreach (directory->subdirs, - (GFunc) matemenu_tree_item_unref, - NULL); - g_slist_free (directory->subdirs); + g_slist_free_full (directory->subdirs, + matemenu_tree_item_unref); directory->subdirs = NULL; - g_slist_foreach (directory->entries, - (GFunc) matemenu_tree_item_unref, - NULL); - g_slist_free (directory->entries); + g_slist_free_full (directory->entries, + matemenu_tree_item_unref); directory->entries = NULL; - g_slist_foreach (directory->default_layout_info, - (GFunc) menu_layout_node_unref, - NULL); - g_slist_free (directory->default_layout_info); + g_slist_free_full (directory->default_layout_info, + (GDestroyNotify) menu_layout_node_unref); directory->default_layout_info = NULL; - g_slist_foreach (directory->layout_info, - (GFunc) menu_layout_node_unref, - NULL); - g_slist_free (directory->layout_info); + g_slist_free_full (directory->layout_info, + (GDestroyNotify) menu_layout_node_unref); directory->layout_info = NULL; } diff --git a/libmenu/menu-layout.c b/libmenu/menu-layout.c index 641aff5..f51ef24 100644 --- a/libmenu/menu-layout.c +++ b/libmenu/menu-layout.c @@ -2163,6 +2163,8 @@ end_element_handler (GMarkupParseContext *context, if (!fixup_move_node (context, parser, parser->stack_top, error)) goto out; break; + default: + g_assert_not_reached(); } out: @@ -2248,6 +2250,8 @@ text_handler (GMarkupParseContext *context, g_markup_parse_context_get_element (context)); } break; + default: + g_assert_not_reached(); } add_context_to_error (error, context); diff --git a/libmenu/menu-monitor.c b/libmenu/menu-monitor.c index b57174f..ca52403 100644 --- a/libmenu/menu-monitor.c +++ b/libmenu/menu-monitor.c @@ -378,12 +378,13 @@ static void mate_menu_monitor_notify_unref(MenuMonitorNotify* notify) void menu_monitor_add_notify(MenuMonitor* monitor, MenuMonitorNotifyFunc notify_func, gpointer user_data) { + GSList* tmp; MenuMonitorNotify* notify; g_return_if_fail(monitor != NULL); g_return_if_fail(notify_func != NULL); - GSList* tmp = monitor->notifies; + tmp = monitor->notifies; while (tmp != NULL) { diff --git a/libmenu/menu-util.c b/libmenu/menu-util.c index cfcfc77..94d9968 100644 --- a/libmenu/menu-util.c +++ b/libmenu/menu-util.c @@ -177,7 +177,7 @@ static void append_layout(MenuLayoutNode* node, int depth, const char* node_name layout_values->inline_menus ? "true" : "false", layout_values->inline_header ? "true" : "false", layout_values->inline_alias ? "true" : "false", - layout_values->inline_limit, + (gint) layout_values->inline_limit, escaped, node_name); @@ -193,7 +193,7 @@ static void append_layout(MenuLayoutNode* node, int depth, const char* node_name layout_values->inline_menus ? "true" : "false", layout_values->inline_header ? "true" : "false", layout_values->inline_alias ? "true" : "false", - layout_values->inline_limit); + (gint) layout_values->inline_limit); } } diff --git a/libmenu/meson.build b/libmenu/meson.build new file mode 100644 index 0000000..5fbc93e --- /dev/null +++ b/libmenu/meson.build @@ -0,0 +1,72 @@ +source_h = [ + 'matemenu-tree.h', +] + +install_headers(source_h, subdir : 'mate-menus') + +sources = [ + 'desktop-entries.h', + 'entry-directories.h', + 'menu-layout.h', + 'menu-monitor.h', + 'menu-util.h', + 'desktop-entries.c', + 'entry-directories.c', + 'matemenu-tree.c', + 'menu-layout.c', + 'menu-monitor.c', + 'menu-util.c', +] + +gnome = import('gnome') +pkg = import('pkgconfig') + +libmate_menu = shared_library('mate-menu', + sources, + dependencies: [gio_unix_dep], + soversion: soversion, + version: libversion, + include_directories: top_srcdir, + install : true, + install_dir : get_option('libdir') + ) + +libmate_menu_deps = declare_dependency(sources: source_h, + include_directories: [top_srcdir, include_directories('.')], + dependencies: [gio_unix_dep], + link_with: libmate_menu) + +pkg.generate( + name: 'mate-menu', + version: meson.project_version(), + description: 'Desktop Menu Specification Implementation', + requires_private: 'gio-unix-2.0', + filebase: 'libmate-menu', + libraries: '-lmate-menu', + subdirs: 'mate-menus', + ) + +if get_option('introspection') + libmate_menu_gir = gnome.generate_gir(libmate_menu, + sources: [source_h, sources], + nsversion : api_version, + namespace : 'MateMenu', + symbol_prefix : 'matemenu', + export_packages: 'libmatemenu', + identifier_prefix : 'MateMenu', + link_with: libmate_menu, + includes : ['Gio-2.0'], + install : true, + install_dir_gir: girdir, + install_dir_typelib: typelibdir, + extra_args: [ '--c-include=mate-menus/matemenu-tree.h' ], + ) + if get_option('vapi') + mate_menu_vapi = gnome.generate_vapi('libmate-menu', + sources: libmate_menu_gir.get(0), + packages: 'gio-unix-2.0', + install: true, + install_dir: vapidir, + ) + endif +endif |