Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package libdazzle for openSUSE:Factory checked in at 2021-09-29 20:18:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libdazzle (Old) and /work/SRC/openSUSE:Factory/.libdazzle.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libdazzle" Wed Sep 29 20:18:19 2021 rev:22 rq:922157 version:3.42.0 Changes: -------- --- /work/SRC/openSUSE:Factory/libdazzle/libdazzle.changes 2021-04-12 12:38:27.117445116 +0200 +++ /work/SRC/openSUSE:Factory/.libdazzle.new.1899/libdazzle.changes 2021-09-29 20:19:19.991024902 +0200 @@ -1,0 +2,15 @@ +Wed Sep 29 10:37:39 UTC 2021 - Bj??rn Lie <[email protected]> + +- Add manual libdazzle = %{version} Provides to make the lang pack + auto installable. + +------------------------------------------------------------------- +Fri Sep 3 21:47:57 UTC 2021 - Bj??rn Lie <[email protected]> + +- Update to version 3.42.0: + + Panel fixes. + + Allow DzlTaskCache to use NULL copy/free funcs. + + Updated translations. +- Add lang sub-package now that there are translations. + +------------------------------------------------------------------- Old: ---- libdazzle-3.40.0.tar.xz New: ---- libdazzle-3.42.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libdazzle.spec ++++++ --- /var/tmp/diff_new_pack.mYZmaj/_old 2021-09-29 20:19:20.435025546 +0200 +++ /var/tmp/diff_new_pack.mYZmaj/_new 2021-09-29 20:19:20.439025552 +0200 @@ -17,13 +17,13 @@ Name: libdazzle -Version: 3.40.0 +Version: 3.42.0 Release: 0 Summary: Collection of fancy features for GLib and Gtk+ License: GPL-3.0-or-later AND LGPL-2.1-or-later Group: Development/Tools/Other URL: https://gitlab.gnome.org/GNOME/libdazzle -Source0: https://download.gnome.org/sources/libdazzle/3.40/%{name}-%{version}.tar.xz +Source0: https://download.gnome.org/sources/libdazzle/3.42/%{name}-%{version}.tar.xz BuildRequires: gtk-doc BuildRequires: meson >= 0.50.0 @@ -53,6 +53,8 @@ %package -n libdazzle-1_0-0 Summary: Collection of fancy features for GLib and Gtk+ -- Library file Group: System/Libraries +# Manual provides to make the lang pack installable +Provides: libdazzle = %{version} %description -n libdazzle-1_0-0 This library is a companion library to GObject and Gtk+. @@ -92,6 +94,8 @@ This package provides the development files, and its documentation, for libdazzle. +%lang_package + %prep %autosetup -p1 @@ -113,6 +117,7 @@ %install %meson_install +%find_lang %{name}-1.0 %{?no_lang_C} %post -n libdazzle-1_0-0 -p /sbin/ldconfig %postun -n libdazzle-1_0-0 -p /sbin/ldconfig @@ -139,4 +144,6 @@ %{_datadir}/vala/vapi/libdazzle-1.0.deps %{_datadir}/vala/vapi/libdazzle-1.0.vapi +%files lang -f %{name}-1.0.lang + %changelog ++++++ libdazzle-3.40.0.tar.xz -> libdazzle-3.42.0.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/NEWS new/libdazzle-3.42.0/NEWS --- old/libdazzle-3.40.0/NEWS 2021-03-20 01:06:23.758871800 +0100 +++ new/libdazzle-3.42.0/NEWS 2021-09-03 21:45:46.680750400 +0200 @@ -1,4 +1,16 @@ ============== +Version 3.42.0 +============== + +Changes in this release: + + ??? Build system fixes for macOS + ??? Win32 fixes + ??? Panel fixes + ??? Allow DzlTaskCache to use NULL copy/free funcs + ??? Additional translations + +============== Version 3.40.0 ============== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/meson.build new/libdazzle-3.42.0/meson.build --- old/libdazzle-3.40.0/meson.build 2021-03-20 01:06:23.762871700 +0100 +++ new/libdazzle-3.42.0/meson.build 2021-09-03 21:45:46.684750300 +0200 @@ -1,5 +1,5 @@ project('libdazzle', 'c', - version: '3.40.0', + version: '3.42.0', license: 'GPLv3+', meson_version: '>= 0.50.0', default_options: [ 'warning_level=1', 'buildtype=debugoptimized', 'c_std=gnu11' ], @@ -39,6 +39,12 @@ '-DDAZZLE_COMPILATION', ], language: 'c') +if host_machine.system() == 'darwin' + add_project_arguments([ + '-DPLATFORM_OSX', + ], language: 'c') +endif + root_inc = include_directories('.') src_inc = include_directories('src') @@ -73,7 +79,6 @@ '-Werror=shadow', '-Werror=strict-prototypes', '-Werror=trigraphs', - '-Werror=undef', '-Werror=write-strings', '-Wformat-nonliteral', ['-Werror=format-security', '-Werror=format=2' ], @@ -95,7 +100,6 @@ '-Wstrict-prototypes', '-Wswitch-default', '-Wswitch-enum', - '-Wundef', '-Wuninitialized', '-Wunused', '-fno-strict-aliasing', @@ -118,7 +122,7 @@ if get_option('default_library') != 'static' if host_machine.system() == 'windows' config_h.set('DLL_EXPORT', true) - if cc.get_id() == 'msvc' + if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' config_h.set('_DZL_EXTERN', '__declspec(dllexport) extern') elif cc.has_argument('-fvisibility=hidden') config_h.set('_DZL_EXTERN', '__attribute__((visibility("default"))) __declspec(dllexport) extern') diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/po/LINGUAS new/libdazzle-3.42.0/po/LINGUAS --- old/libdazzle-3.40.0/po/LINGUAS 2021-03-20 01:06:23.762871700 +0100 +++ new/libdazzle-3.42.0/po/LINGUAS 2021-09-03 21:45:46.684750300 +0200 @@ -1 +1,3 @@ # Please keep this list sorted alphabetically +de +zh_CN diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/po/de.po new/libdazzle-3.42.0/po/de.po --- old/libdazzle-3.40.0/po/de.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libdazzle-3.42.0/po/de.po 2021-09-03 21:45:46.685750200 +0200 @@ -0,0 +1,310 @@ +# German translation for libdazzle. +# Copyright (C) 2020 libdazzle's COPYRIGHT HOLDER +# This file is distributed under the same license as the libdazzle package. +# Tim Sabsch <[email protected]>, 2021. +# Philipp Kiemle <[email protected]>, 2020-2021. +# +msgid "" +msgstr "" +"Project-Id-Version: libdazzle master\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libdazzle/issues\n"; +"POT-Creation-Date: 2021-04-01 03:18+0000\n" +"PO-Revision-Date: 2021-04-09 09:59+0200\n" +"Last-Translator: Philipp Kiemle <[email protected]>\n" +"Language-Team: German <[email protected]>\n" +"Language: de\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 2.4.1\n" + +#: src/animation/dzl-animation.c:752 +#, c-format +msgid "Cannot locate property %s in class %s" +msgstr "Eigenschaft %s in der Klasse %s konnte nicht gefunden werden" + +#: src/animation/dzl-animation.c:1099 src/animation/dzl-animation.c:1105 +#, c-format +msgid "Failed to find property %s in %s" +msgstr "Eigenschaft %s in %s konnte nicht gefunden werden" + +#: src/animation/dzl-animation.c:1113 +#, c-format +msgid "Failed to find property %s in %s or parent %s" +msgstr "" +"Eigenschaft %s konnte nicht in %s oder dem Elternobjekt %s gefunden werden" + +#: src/animation/dzl-animation.c:1123 +#, c-format +msgid "Failed to retrieve va_list value: %s" +msgstr "Empfangen des va_list-Wertes ist gescheitert: %s" + +#: src/files/dzl-directory-model.c:377 +msgid "Directory" +msgstr "Ordner" + +#: src/files/dzl-directory-model.c:378 +msgid "The directory to list files from." +msgstr "Dateien aus diesem Ordner auflisten." + +#: src/prefs/dzl-preferences-font-button.ui:57 +msgid "_Select" +msgstr "Au_sw??hlen" + +#: src/prefs/dzl-preferences-view.ui:15 +msgid "Search Preferences" +msgstr "Sucheinstellungen" + +#: src/search/dzl-trie.c:782 +#, c-format +msgid "Traversal order %u is not supported on DzlTrie." +msgstr "Traversierungsreihenfolge %u wird nicht von DzlTrie unterst??tzt." + +#: src/shortcuts/dzl-shortcut-accel-dialog.c:446 +#: src/widgets/dzl-file-chooser-entry.c:168 +msgid "Cancel" +msgstr "Abbrechen" + +#: src/shortcuts/dzl-shortcut-accel-dialog.c:447 +msgid "Set" +msgstr "Festlegen" + +#. Translators: <b>%s</b> is used to show the provided text in bold +#: src/shortcuts/dzl-shortcut-accel-dialog.c:504 +#, c-format +msgid "Enter new shortcut to change <b>%s</b>." +msgstr "Geben Sie eine neue Tastenkombination ein, um <b>%s</b> zu ??ndern." + +#: src/shortcuts/dzl-shortcut-accel-dialog.ui:43 +msgid "Press Escape to cancel or Backspace to disable." +msgstr "Dr??cken Sie Esc zum Abbrechen oder die R??cktaste zum deaktivieren." + +#: src/shortcuts/dzl-shortcut-manager.c:219 +msgid "Default Shortcuts" +msgstr "Standard-Tastenkombinationen" + +#: src/shortcuts/dzl-shortcuts-group.c:304 +#: src/shortcuts/dzl-shortcuts-section.c:364 +msgid "Title" +msgstr "Titel" + +#: src/shortcuts/dzl-shortcuts-group.c:318 +msgid "View" +msgstr "Ansicht" + +# Der Bereich im Shortcut-Fenster, der die Tastenk??rzel anzeigt (im Vergleich zum Bereich, in dem die Namen der K??rzel stehen). +# ??Gr????en-Gruppe?? bezieht sich auf eine GtkSizeGroup +#: src/shortcuts/dzl-shortcuts-group.c:331 +#: src/shortcuts/dzl-shortcuts-group.c:332 +msgid "Accelerator Size Group" +msgstr "K??rzel-Gr????en-Gruppe" + +# Der Bereich im Shortcut-Fenster, der die Namen der K??rzel anzeigt (im Vergleich zum Bereich, in dem die K??rzel selbst stehen). +#: src/shortcuts/dzl-shortcuts-group.c:345 +#: src/shortcuts/dzl-shortcuts-group.c:346 +msgid "Title Size Group" +msgstr "Titel-Gr????en-Gruppe" + +#: src/shortcuts/dzl-shortcuts-group.c:358 +msgid "Height" +msgstr "H??he" + +#: src/shortcuts/dzl-shortcuts-section.c:338 +#: src/shortcuts/dzl-shortcuts-window.c:784 +msgid "Section Name" +msgstr "Abschnittsname" + +#: src/shortcuts/dzl-shortcuts-section.c:352 +#: src/shortcuts/dzl-shortcuts-window.c:799 +msgid "View Name" +msgstr "Ansichtsname" + +#: src/shortcuts/dzl-shortcuts-section.c:377 +msgid "Maximum Height" +msgstr "Maximale H??he" + +#: src/shortcuts/dzl-shortcuts-section.c:384 +msgid "change-current-page" +msgstr "aktuelle-seite-??ndern" + +#: src/shortcuts/dzl-shortcuts-section.c:437 +msgid "_Show All" +msgstr "_Alle anzeigen" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:135 +msgid "Two finger pinch" +msgstr "Zweifinger-Stauchen" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:139 +msgid "Two finger stretch" +msgstr "Zweifinger-Strecken" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:143 +msgid "Rotate clockwise" +msgstr "Im Uhrzeigersinn drehen" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:147 +msgid "Rotate counterclockwise" +msgstr "Gegen den Uhrzeigersinn drehen" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:151 +msgid "Two finger swipe left" +msgstr "Zweifinger-Wischen nach links" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:155 +msgid "Two finger swipe right" +msgstr "Zweifinger-Wischen nach rechts" + +#. * +#. * DzlShortcutsWindow::close: +#. * +#. * The ::close signal is a +#. * [keybinding signal][GtkBindingSignal] +#. * which gets emitted when the user uses a keybinding to close +#. * the window. +#. * +#. * The default binding for this signal is the Escape key. +#. +#: src/shortcuts/dzl-shortcuts-window.c:815 +msgid "close" +msgstr "schlie??en" + +#. * +#. * DzlShortcutsWindow::search: +#. * +#. * The ::search signal is a +#. * [keybinding signal][GtkBindingSignal] +#. * which gets emitted when the user uses a keybinding to start a search. +#. * +#. * The default binding for this signal is Control-F. +#. +#: src/shortcuts/dzl-shortcuts-window.c:832 +msgid "search" +msgstr "suchen" + +#: src/shortcuts/dzl-shortcuts-window.c:926 +msgid "Shortcuts" +msgstr "Tastenkombinationen" + +#: src/shortcuts/dzl-shortcuts-window.c:931 +msgid "Search Results" +msgstr "Suchergebnisse" + +#: src/shortcuts/dzl-shortcuts-window.c:985 +msgid "Search Shortcuts" +msgstr "Nach Tastenkombinationen suchen" + +#: src/shortcuts/dzl-shortcuts-window.c:1050 +msgid "No Results Found" +msgstr "Keine Ergebnisse gefunden" + +#: src/shortcuts/dzl-shortcuts-window.c:1057 +msgid "Try a different search" +msgstr "Versuchen Sie eine andere Suchanfrage" + +#: src/shortcuts/dzl-shortcut-theme-editor.c:200 +msgid "Set Shortcut" +msgstr "Tastenkombination festlegen" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:16 +msgid "Keyboard Shortcuts" +msgstr "Tastenkombinationen" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:26 +msgid "Filter Shortcuts" +msgstr "Tastenkombinationen filtern" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:53 +msgid "Action" +msgstr "Aktion" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:66 +msgid "Shortcut" +msgstr "Tastenkombination" + +#: src/util/dzl-date-time.c:66 +msgid "Just now" +msgstr "Gerade eben" + +#: src/util/dzl-date-time.c:68 +msgid "An hour ago" +msgstr "Vor einer Stunde" + +#: src/util/dzl-date-time.c:70 +msgid "Yesterday" +msgstr "Gestern" + +#: src/util/dzl-date-time.c:76 +msgid "About a year ago" +msgstr "Etwa vor einem Jahr" + +#: src/util/dzl-date-time.c:80 +#, c-format +msgid "About %u year ago" +msgid_plural "About %u years ago" +msgstr[0] "Etwa vor %u Jahr" +msgstr[1] "Etwa vor %u Jahren" + +#: src/util/dzl-file-manager.c:89 +msgid "File path is NULL" +msgstr "Dateipfad ist NULL" + +#: src/util/dzl-file-manager.c:98 src/util/dzl-file-manager.c:109 +msgid "Error converting UTF-8 filename to wide char" +msgstr "" +"Der Dateiname konnte nicht von UTF-8 in Breitzeichen umgewandelt werden" + +#: src/util/dzl-file-manager.c:117 +msgid "ILCreateFromPath() failed" +msgstr "ILCreateFromPath() fehlgeschlagen" + +#: src/util/dzl-file-manager.c:154 +#, c-format +msgid "Cannot convert ???%s??? into a valid NSURL." +msgstr "??%s?? konnte nicht in eine g??ltige NSURL umgewandelt werden." + +#: src/widgets/dzl-counters-window.ui:14 +msgid "Category" +msgstr "Kategorie" + +#: src/widgets/dzl-counters-window.ui:26 +msgid "Name" +msgstr "Name" + +#: src/widgets/dzl-counters-window.ui:38 +msgid "Value" +msgstr "Wert" + +#: src/widgets/dzl-counters-window.ui:49 +msgid "Description" +msgstr "Beschreibung" + +#: src/widgets/dzl-file-chooser-entry.c:105 +#: src/widgets/dzl-file-chooser-entry.c:169 +msgid "Open" +msgstr "??ffnen" + +#: src/widgets/dzl-file-chooser-entry.c:109 +msgid "Select" +msgstr "Ausw??hlen" + +#: src/widgets/dzl-file-chooser-entry.c:113 +msgid "Create" +msgstr "Erstellen" + +#: src/widgets/dzl-file-chooser-entry.c:117 +msgid "Save" +msgstr "Speichern" + +#: src/widgets/dzl-file-chooser-entry.c:473 +msgid "Browse???" +msgstr "Durchsuchen ???" + +#: src/widgets/dzl-search-bar.c:380 +msgid "Search" +msgstr "Suche" + +#: src/widgets/dzl-stack-list.c:417 src/widgets/dzl-stack-list.c:418 +msgid "Model" +msgstr "Modell" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/po/zh_CN.po new/libdazzle-3.42.0/po/zh_CN.po --- old/libdazzle-3.40.0/po/zh_CN.po 1970-01-01 01:00:00.000000000 +0100 +++ new/libdazzle-3.42.0/po/zh_CN.po 2021-09-03 21:45:46.685750200 +0200 @@ -0,0 +1,303 @@ +# Chinese (China) translation for libdazzle. +# Copyright (C) 2021 libdazzle's COPYRIGHT HOLDER +# This file is distributed under the same license as the libdazzle package. +# Silence Zhou <[email protected]>, 2021. +# +msgid "" +msgstr "" +"Project-Id-Version: libdazzle master\n" +"Report-Msgid-Bugs-To: https://gitlab.gnome.org/GNOME/libdazzle/issues\n"; +"POT-Creation-Date: 2021-06-30 15:20+0000\n" +"PO-Revision-Date: 2021-08-28 17:12-0400\n" +"Last-Translator: Boyuan Yang <[email protected]>\n" +"Language-Team: Chinese (China) <[email protected]>\n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: Poedit 3.0\n" + +#: src/animation/dzl-animation.c:752 +#, c-format +msgid "Cannot locate property %s in class %s" +msgstr "?????? %2$s ????????????????????? %1$s" + +#: src/animation/dzl-animation.c:1099 src/animation/dzl-animation.c:1105 +#, c-format +msgid "Failed to find property %s in %s" +msgstr "??? %2$s ?????????????????? %1$s" + +#: src/animation/dzl-animation.c:1113 +#, c-format +msgid "Failed to find property %s in %s or parent %s" +msgstr "?????? %2$s ????????? %3$s ?????????????????? %1$s" + +#: src/animation/dzl-animation.c:1123 +#, c-format +msgid "Failed to retrieve va_list value: %s" +msgstr "va_list ???????????????: %s" + +#: src/files/dzl-directory-model.c:377 +msgid "Directory" +msgstr "??????" + +#: src/files/dzl-directory-model.c:378 +msgid "The directory to list files from." +msgstr "?????????????????????????????????" + +#: src/prefs/dzl-preferences-font-button.ui:57 +msgid "_Select" +msgstr "??????(_S)" + +#: src/prefs/dzl-preferences-view.ui:15 +msgid "Search Preferences" +msgstr "????????????" + +#: src/search/dzl-trie.c:782 +#, c-format +msgid "Traversal order %u is not supported on DzlTrie." +msgstr "DzlTrie ????????????????????? %u???" + +#: src/shortcuts/dzl-shortcut-accel-dialog.c:446 +#: src/widgets/dzl-file-chooser-entry.c:168 +msgid "Cancel" +msgstr "??????" + +#: src/shortcuts/dzl-shortcut-accel-dialog.c:447 +msgid "Set" +msgstr "??????" + +#. Translators: <b>%s</b> is used to show the provided text in bold +#: src/shortcuts/dzl-shortcut-accel-dialog.c:504 +#, c-format +msgid "Enter new shortcut to change <b>%s</b>." +msgstr "??????????????????????????????<b>%s</b>???" + +#: src/shortcuts/dzl-shortcut-accel-dialog.ui:43 +msgid "Press Escape to cancel or Backspace to disable." +msgstr "??? Escape ??????????????? Backspace ?????????" + +#: src/shortcuts/dzl-shortcut-manager.c:219 +msgid "Default Shortcuts" +msgstr "???????????????" + +#: src/shortcuts/dzl-shortcuts-group.c:304 +#: src/shortcuts/dzl-shortcuts-section.c:364 +msgid "Title" +msgstr "??????" + +#: src/shortcuts/dzl-shortcuts-group.c:318 +msgid "View" +msgstr "??????" + +#: src/shortcuts/dzl-shortcuts-group.c:331 +#: src/shortcuts/dzl-shortcuts-group.c:332 +msgid "Accelerator Size Group" +msgstr "" + +#: src/shortcuts/dzl-shortcuts-group.c:345 +#: src/shortcuts/dzl-shortcuts-group.c:346 +msgid "Title Size Group" +msgstr "" + +#: src/shortcuts/dzl-shortcuts-group.c:358 +msgid "Height" +msgstr "??????" + +#: src/shortcuts/dzl-shortcuts-section.c:338 +#: src/shortcuts/dzl-shortcuts-window.c:784 +msgid "Section Name" +msgstr "" + +#: src/shortcuts/dzl-shortcuts-section.c:352 +#: src/shortcuts/dzl-shortcuts-window.c:799 +msgid "View Name" +msgstr "????????????" + +#: src/shortcuts/dzl-shortcuts-section.c:377 +msgid "Maximum Height" +msgstr "????????????" + +#: src/shortcuts/dzl-shortcuts-section.c:384 +msgid "change-current-page" +msgstr "" + +#: src/shortcuts/dzl-shortcuts-section.c:437 +msgid "_Show All" +msgstr "????????????(_S)" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:135 +msgid "Two finger pinch" +msgstr "??????????????????" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:139 +msgid "Two finger stretch" +msgstr "??????????????????" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:143 +msgid "Rotate clockwise" +msgstr "???????????????" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:147 +msgid "Rotate counterclockwise" +msgstr "?????????????????????" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:151 +msgid "Two finger swipe left" +msgstr "????????????????????????" + +#: src/shortcuts/dzl-shortcuts-shortcut.c:155 +msgid "Two finger swipe right" +msgstr "????????????????????????" + +#. * +#. * DzlShortcutsWindow::close: +#. * +#. * The ::close signal is a +#. * [keybinding signal][GtkBindingSignal] +#. * which gets emitted when the user uses a keybinding to close +#. * the window. +#. * +#. * The default binding for this signal is the Escape key. +#. +#: src/shortcuts/dzl-shortcuts-window.c:815 +msgid "close" +msgstr "??????" + +#. * +#. * DzlShortcutsWindow::search: +#. * +#. * The ::search signal is a +#. * [keybinding signal][GtkBindingSignal] +#. * which gets emitted when the user uses a keybinding to start a search. +#. * +#. * The default binding for this signal is Control-F. +#. +#: src/shortcuts/dzl-shortcuts-window.c:832 +msgid "search" +msgstr "??????" + +#: src/shortcuts/dzl-shortcuts-window.c:926 +msgid "Shortcuts" +msgstr "?????????" + +#: src/shortcuts/dzl-shortcuts-window.c:931 +msgid "Search Results" +msgstr "????????????" + +#: src/shortcuts/dzl-shortcuts-window.c:985 +msgid "Search Shortcuts" +msgstr "???????????????" + +#: src/shortcuts/dzl-shortcuts-window.c:1050 +msgid "No Results Found" +msgstr "???????????????" + +#: src/shortcuts/dzl-shortcuts-window.c:1057 +msgid "Try a different search" +msgstr "?????????????????????" + +#: src/shortcuts/dzl-shortcut-theme-editor.c:200 +msgid "Set Shortcut" +msgstr "???????????????" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:16 +msgid "Keyboard Shortcuts" +msgstr "?????????" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:26 +msgid "Filter Shortcuts" +msgstr "???????????????" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:53 +msgid "Action" +msgstr "??????" + +#: src/shortcuts/dzl-shortcut-theme-editor.ui:66 +msgid "Shortcut" +msgstr "?????????" + +#: src/util/dzl-date-time.c:66 +msgid "Just now" +msgstr "??????" + +#: src/util/dzl-date-time.c:68 +msgid "An hour ago" +msgstr "????????????" + +#: src/util/dzl-date-time.c:70 +msgid "Yesterday" +msgstr "??????" + +#: src/util/dzl-date-time.c:76 +msgid "About a year ago" +msgstr "???????????????" + +#: src/util/dzl-date-time.c:80 +#, c-format +msgid "About %u year ago" +msgid_plural "About %u years ago" +msgstr[0] "?????? %u ??????" + +#: src/util/dzl-file-manager.c:89 +msgid "File path is NULL" +msgstr "??????????????? NULL" + +#: src/util/dzl-file-manager.c:98 src/util/dzl-file-manager.c:109 +msgid "Error converting UTF-8 filename to wide char" +msgstr "??? UTF-8 ????????????????????????????????????" + +#: src/util/dzl-file-manager.c:117 +msgid "ILCreateFromPath() failed" +msgstr "ILCreateFromPath() ??????" + +#: src/util/dzl-file-manager.c:154 +#, c-format +msgid "Cannot convert ???%s??? into a valid NSURL." +msgstr "????????? ???%s??? ??????????????????NSURL???" + +#: src/widgets/dzl-counters-window.ui:14 +msgid "Category" +msgstr "??????" + +#: src/widgets/dzl-counters-window.ui:26 +msgid "Name" +msgstr "??????" + +#: src/widgets/dzl-counters-window.ui:38 +msgid "Value" +msgstr "???" + +#: src/widgets/dzl-counters-window.ui:49 +msgid "Description" +msgstr "??????" + +#: src/widgets/dzl-file-chooser-entry.c:105 +#: src/widgets/dzl-file-chooser-entry.c:169 +msgid "Open" +msgstr "??????" + +#: src/widgets/dzl-file-chooser-entry.c:109 +msgid "Select" +msgstr "??????" + +#: src/widgets/dzl-file-chooser-entry.c:113 +msgid "Create" +msgstr "??????" + +#: src/widgets/dzl-file-chooser-entry.c:117 +msgid "Save" +msgstr "??????" + +#: src/widgets/dzl-file-chooser-entry.c:473 +msgid "Browse???" +msgstr "?????????" + +#: src/widgets/dzl-search-bar.c:380 +msgid "Search" +msgstr "??????" + +#: src/widgets/dzl-stack-list.c:417 src/widgets/dzl-stack-list.c:418 +msgid "Model" +msgstr "??????" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/cache/dzl-task-cache.c new/libdazzle-3.42.0/src/cache/dzl-task-cache.c --- old/libdazzle-3.40.0/src/cache/dzl-task-cache.c 2021-03-20 01:06:23.767871900 +0100 +++ new/libdazzle-3.42.0/src/cache/dzl-task-cache.c 2021-09-03 21:45:46.689750400 +0200 @@ -718,8 +718,6 @@ if ((self->key_equal_func == NULL) || (self->key_hash_func == NULL) || - (self->value_copy_func == NULL) || - (self->value_destroy_func == NULL) || (self->populate_callback == NULL)) { g_error ("DzlTaskCache was configured improperly."); @@ -732,6 +730,12 @@ if (self->key_destroy_func == NULL) self->key_destroy_func = dzl_task_cache_dummy_destroy_func; + if (self->value_copy_func == NULL) + self->value_copy_func = dzl_task_cache_dummy_copy_func; + + if (self->value_destroy_func == NULL) + self->value_destroy_func = dzl_task_cache_dummy_destroy_func; + /* * This is where the cached result objects live. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/dazzle.h new/libdazzle-3.42.0/src/dazzle.h --- old/libdazzle-3.40.0/src/dazzle.h 2021-03-20 01:06:23.767871900 +0100 +++ new/libdazzle-3.42.0/src/dazzle.h 2021-09-03 21:45:46.690750400 +0200 @@ -133,7 +133,9 @@ #include "tree/dzl-tree-types.h" #include "util/dzl-cairo.h" #include "util/dzl-cancellable.h" -#include "util/dzl-counter.h" +#ifndef G_OS_WIN32 +# include "util/dzl-counter.h" +#endif #include "util/dzl-date-time.h" #include "util/dzl-dnd.h" #include "util/dzl-file-manager.h" @@ -153,7 +155,9 @@ #include "widgets/dzl-box.h" #include "widgets/dzl-centering-bin.h" #include "widgets/dzl-column-layout.h" -#include "widgets/dzl-counters-window.h" +#ifndef G_OS_WIN32 +# include "widgets/dzl-counters-window.h" +#endif #include "widgets/dzl-elastic-bin.h" #include "widgets/dzl-empty-state.h" #include "widgets/dzl-entry-box.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/graphing/dzl-cpu-model.c new/libdazzle-3.42.0/src/graphing/dzl-cpu-model.c --- old/libdazzle-3.40.0/src/graphing/dzl-cpu-model.c 2021-03-20 01:06:23.770871900 +0100 +++ new/libdazzle-3.42.0/src/graphing/dzl-cpu-model.c 2021-09-03 21:45:46.692750500 +0200 @@ -21,7 +21,9 @@ #include <ctype.h> #include <fcntl.h> #include <stdlib.h> -#include <unistd.h> +#ifdef __linux__ +# include <unistd.h> +#endif #include <stdio.h> #if defined(__FreeBSD__) # include <errno.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/graphing/dzl-graph-line-renderer.c new/libdazzle-3.42.0/src/graphing/dzl-graph-line-renderer.c --- old/libdazzle-3.40.0/src/graphing/dzl-graph-line-renderer.c 2021-03-20 01:06:23.770871900 +0100 +++ new/libdazzle-3.42.0/src/graphing/dzl-graph-line-renderer.c 2021-09-03 21:45:46.693750400 +0200 @@ -19,6 +19,7 @@ #include "config.h" #include <glib/gi18n.h> +#define _USE_MATH_DEFINES #include <math.h> #include "dzl-graph-line-renderer.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/meson.build new/libdazzle-3.42.0/src/meson.build --- old/libdazzle-3.40.0/src/meson.build 2021-03-20 01:06:23.772871700 +0100 +++ new/libdazzle-3.42.0/src/meson.build 2021-09-03 21:45:46.695750500 +0200 @@ -97,6 +97,10 @@ libdazzle_args += '-DDZL_HAVE_RDTSCP' endif +if host_machine.system() == 'darwin' + libdazzle_args += '-xobjective-c' +endif + libdazzle = shared_library( 'dazzle-' + apiversion, libdazzle_sources, @@ -106,7 +110,6 @@ dependencies: libdazzle_deps, include_directories: [ root_inc, src_inc ], install: true, - install_dir: libdir ) libdazzle_dep = declare_dependency( diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/panel/dzl-dock-paned.c new/libdazzle-3.42.0/src/panel/dzl-dock-paned.c --- old/libdazzle-3.40.0/src/panel/dzl-dock-paned.c 2021-03-20 01:06:23.774871800 +0100 +++ new/libdazzle-3.42.0/src/panel/dzl-dock-paned.c 2021-09-03 21:45:46.696750400 +0200 @@ -27,7 +27,7 @@ typedef struct { - GtkPositionType child_edge : 2; + GtkPositionType child_edge; } DzlDockPanedPrivate; G_DEFINE_TYPE_EXTENDED (DzlDockPaned, dzl_dock_paned, DZL_TYPE_MULTI_PANED, 0, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/panel/dzl-dock-stack.c new/libdazzle-3.42.0/src/panel/dzl-dock-stack.c --- old/libdazzle-3.40.0/src/panel/dzl-dock-stack.c 2021-03-20 01:06:23.774871800 +0100 +++ new/libdazzle-3.42.0/src/panel/dzl-dock-stack.c 2021-09-03 21:45:46.697750300 +0200 @@ -32,8 +32,8 @@ GtkStack *stack; DzlTabStrip *tab_strip; GtkButton *pinned_button; - GtkPositionType edge : 2; - DzlTabStyle style : 2; + GtkPositionType edge; + DzlTabStyle style; } DzlDockStackPrivate; static void dzl_dock_stack_init_dock_item_iface (DzlDockItemInterface *iface); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/panel/dzl-dock-widget.c new/libdazzle-3.42.0/src/panel/dzl-dock-widget.c --- old/libdazzle-3.40.0/src/panel/dzl-dock-widget.c 2021-03-20 01:06:23.775871800 +0100 +++ new/libdazzle-3.42.0/src/panel/dzl-dock-widget.c 2021-09-03 21:45:46.697750300 +0200 @@ -254,7 +254,6 @@ dzl_dock_widget_init (DzlDockWidget *self) { gtk_widget_set_has_window (GTK_WIDGET (self), FALSE); - gtk_widget_set_can_focus (GTK_WIDGET (self), TRUE); } GtkWidget * diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/panel/dzl-tab-strip.c new/libdazzle-3.42.0/src/panel/dzl-tab-strip.c --- old/libdazzle-3.40.0/src/panel/dzl-tab-strip.c 2021-03-20 01:06:23.775871800 +0100 +++ new/libdazzle-3.42.0/src/panel/dzl-tab-strip.c 2021-09-03 21:45:46.698750500 +0200 @@ -32,8 +32,8 @@ { GAction *action; GtkStack *stack; - GtkPositionType edge : 2; - DzlTabStyle style : 2; + GtkPositionType edge; + DzlTabStyle style; } DzlTabStripPrivate; static void buildable_iface_init (GtkBuildableIface *iface); @@ -771,7 +771,7 @@ dzl_tab_set_style (DZL_TAB (widget), style); } -guint +DzlTabStyle dzl_tab_strip_get_style (DzlTabStrip *self) { DzlTabStripPrivate *priv = dzl_tab_strip_get_instance_private (self); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/panel/dzl-tab.c new/libdazzle-3.42.0/src/panel/dzl-tab.c --- old/libdazzle-3.40.0/src/panel/dzl-tab.c 2021-03-20 01:06:23.776872000 +0100 +++ new/libdazzle-3.42.0/src/panel/dzl-tab.c 2021-09-03 21:45:46.698750500 +0200 @@ -30,12 +30,6 @@ typedef struct { - /* - * The edge the tab is being displayed upon. We use this to rotate - * text or alter box orientation. - */ - GtkPositionType edge : 2; - /* Can we be closed by the user */ guint can_close : 1; @@ -51,8 +45,14 @@ /* If we are currently activating */ guint in_activate : 1; + /* + * The edge the tab is being displayed upon. We use this to rotate + * text or alter box orientation. + */ + GtkPositionType edge; + /* Our icon/text style */ - DzlTabStyle style : 2; + DzlTabStyle style; /* The action name to change the current tab */ gchar *action_name; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/util/dzl-counter.c new/libdazzle-3.42.0/src/util/dzl-counter.c --- old/libdazzle-3.40.0/src/util/dzl-counter.c 2021-03-20 01:06:23.786872000 +0100 +++ new/libdazzle-3.42.0/src/util/dzl-counter.c 2021-09-03 21:45:46.709750400 +0200 @@ -30,7 +30,9 @@ #include <stdlib.h> #include <string.h> #include <sys/types.h> +#ifndef G_OS_WIN32 #include <unistd.h> +#endif #ifdef G_OS_UNIX # include <sys/mman.h> @@ -148,6 +150,7 @@ DZL_MEMORY_BARRIER; } +#ifndef G_OS_WIN32 static void _dzl_counter_arena_atexit (void) { @@ -158,6 +161,7 @@ g_snprintf (name, sizeof name, NAME_FORMAT, pid); shm_unlink (name); } +#endif static void _dzl_counter_arena_init_local (DzlCounterArena *arena) @@ -418,7 +422,7 @@ g_assert (arena != NULL); if (arena->data_is_mmapped) - munmap (arena->cells, arena->data_length); + munmap ((void *)arena->cells, arena->data_length); else #ifdef G_OS_WIN32 /* Allocated with _aligned_malloc() */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/util/dzl-pango.c new/libdazzle-3.42.0/src/util/dzl-pango.c --- old/libdazzle-3.40.0/src/util/dzl-pango.c 2021-03-20 01:06:23.787871800 +0100 +++ new/libdazzle-3.42.0/src/util/dzl-pango.c 2021-09-03 21:45:46.710750300 +0200 @@ -22,6 +22,7 @@ #include <gdk/gdk.h> #include <glib/gstdio.h> +#define _USE_MATH_DEFINES #include <math.h> #include "util/dzl-pango.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/util/meson.build new/libdazzle-3.42.0/src/util/meson.build --- old/libdazzle-3.40.0/src/util/meson.build 2021-03-20 01:06:23.788871800 +0100 +++ new/libdazzle-3.42.0/src/util/meson.build 2021-09-03 21:45:46.711750500 +0200 @@ -36,6 +36,7 @@ ] # No counters if building on win32 for now. +# When avaiable remove G_OS_WIN32 checks in src/dazzel.h. # They need explicit porting to that platform and should # probably just wrap the eventtrace API or something. if host_machine.system() != 'windows' diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/widgets/dzl-column-layout.c new/libdazzle-3.42.0/src/widgets/dzl-column-layout.c --- old/libdazzle-3.40.0/src/widgets/dzl-column-layout.c 2021-03-20 01:06:23.788871800 +0100 +++ new/libdazzle-3.42.0/src/widgets/dzl-column-layout.c 2021-09-03 21:45:46.711750500 +0200 @@ -18,6 +18,7 @@ #include "config.h" +#define _USE_MATH_DEFINES #include <math.h> #define G_LOG_DOMAIN "dzl-column-layout" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/widgets/dzl-progress-icon.c new/libdazzle-3.42.0/src/widgets/dzl-progress-icon.c --- old/libdazzle-3.40.0/src/widgets/dzl-progress-icon.c 2021-03-20 01:06:23.790871900 +0100 +++ new/libdazzle-3.42.0/src/widgets/dzl-progress-icon.c 2021-09-03 21:45:46.713750400 +0200 @@ -21,6 +21,7 @@ #include "config.h" +#define _USE_MATH_DEFINES #include <math.h> #include "dzl-progress-icon.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/src/widgets/dzl-three-grid.c new/libdazzle-3.42.0/src/widgets/dzl-three-grid.c --- old/libdazzle-3.40.0/src/widgets/dzl-three-grid.c 2021-03-20 01:06:23.791871800 +0100 +++ new/libdazzle-3.42.0/src/widgets/dzl-three-grid.c 2021-09-03 21:45:46.715750500 +0200 @@ -20,6 +20,7 @@ #include "config.h" +#define _USE_MATH_DEFINES #include <math.h> #include "util/dzl-macros.h" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/tests/test-binding-group.c new/libdazzle-3.42.0/tests/test-binding-group.c --- old/libdazzle-3.40.0/tests/test-binding-group.c 2021-03-20 01:06:23.794871800 +0100 +++ new/libdazzle-3.42.0/tests/test-binding-group.c 2021-09-03 21:45:46.718750500 +0200 @@ -245,8 +245,8 @@ { gdouble celsius, fahrenheit; - g_assert (G_VALUE_HOLDS (from_value, G_TYPE_DOUBLE)); - g_assert (G_VALUE_HOLDS (to_value, G_TYPE_DOUBLE)); + g_assert_true (G_VALUE_HOLDS (from_value, G_TYPE_DOUBLE)); + g_assert_true (G_VALUE_HOLDS (to_value, G_TYPE_DOUBLE)); celsius = g_value_get_double (from_value); fahrenheit = (9 * celsius / 5) + 32.0; @@ -267,8 +267,8 @@ { gdouble celsius, fahrenheit; - g_assert (G_VALUE_HOLDS (from_value, G_TYPE_DOUBLE)); - g_assert (G_VALUE_HOLDS (to_value, G_TYPE_DOUBLE)); + g_assert_true (G_VALUE_HOLDS (from_value, G_TYPE_DOUBLE)); + g_assert_true (G_VALUE_HOLDS (to_value, G_TYPE_DOUBLE)); fahrenheit = g_value_get_double (from_value); celsius = 5 * (fahrenheit - 32.0) / 9; @@ -341,7 +341,7 @@ g_assert_null (dzl_binding_group_get_source (group)); dzl_binding_group_set_source (group, source); - g_assert (dzl_binding_group_get_source (group) == (GObject *)source); + g_assert_true (dzl_binding_group_get_source (group) == (GObject *)source); for (i = 0; i < 2; ++i) { @@ -356,7 +356,7 @@ dzl_binding_group_set_source (group, NULL); g_assert_null (dzl_binding_group_get_source (group)); dzl_binding_group_set_source (group, source); - g_assert (dzl_binding_group_get_source (group) == (GObject *)source); + g_assert_true (dzl_binding_group_get_source (group) == (GObject *)source); } g_object_unref (group); @@ -388,7 +388,7 @@ g_assert_null (dzl_binding_group_get_source (group)); dzl_binding_group_set_source (group, source); - g_assert (dzl_binding_group_get_source (group) == (GObject *)source); + g_assert_true (dzl_binding_group_get_source (group) == (GObject *)source); for (i = 0; i < 2; ++i) { @@ -403,7 +403,7 @@ dzl_binding_group_set_source (group, NULL); g_assert_null (dzl_binding_group_get_source (group)); dzl_binding_group_set_source (group, source); - g_assert (dzl_binding_group_get_source (group) == (GObject *)source); + g_assert_true (dzl_binding_group_get_source (group) == (GObject *)source); } g_object_unref (group); @@ -554,7 +554,7 @@ G_BINDING_BIDIRECTIONAL); g_object_add_weak_pointer (G_OBJECT (source), (gpointer)&source); - g_assert (dzl_binding_group_get_source (group) == (GObject *)source); + g_assert_true (dzl_binding_group_get_source (group) == (GObject *)source); g_object_unref (source); g_assert_null (source); g_assert_null (dzl_binding_group_get_source (group)); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/libdazzle-3.40.0/tests/test-task-cache.c new/libdazzle-3.42.0/tests/test-task-cache.c --- old/libdazzle-3.40.0/tests/test-task-cache.c 2021-03-20 01:06:23.796872000 +0100 +++ new/libdazzle-3.42.0/tests/test-task-cache.c 2021-09-03 21:45:46.720750600 +0200 @@ -25,10 +25,10 @@ ret = dzl_task_cache_get_finish (cache, result, &error); g_assert_no_error (error); - g_assert (ret != NULL); - g_assert (ret == foo); + g_assert_nonnull (ret); + g_assert_true (ret == foo); - g_assert (dzl_task_cache_evict (cache, "foo")); + g_assert_true (dzl_task_cache_evict (cache, "foo")); g_object_unref (ret); g_main_loop_quit (main_loop); @@ -47,15 +47,67 @@ 100 /* msec */, populate_callback, NULL, NULL); - g_assert (!dzl_task_cache_peek (cache, "foo")); - g_assert (!dzl_task_cache_evict (cache, "foo")); + g_assert_null (dzl_task_cache_peek (cache, "foo")); + g_assert_false (dzl_task_cache_evict (cache, "foo")); dzl_task_cache_get_async (cache, "foo", TRUE, NULL, get_foo_cb, NULL); g_main_loop_run (main_loop); g_main_loop_unref (main_loop); - g_assert (foo == NULL); + g_assert_null (foo); +} + +static void +populate_callback_raw_value (DzlTaskCache *self, + gconstpointer key, + GTask *task, + gpointer user_data) +{ + g_task_return_pointer (task, GINT_TO_POINTER ((gint) TRUE), NULL); +} + +static void +get_foo_raw_value_cb (GObject *object, + GAsyncResult *result, + gpointer user_data) +{ + GError *error = NULL; + gboolean value; + gpointer ret; + + ret = dzl_task_cache_get_finish (cache, result, &error); + g_assert_no_error (error); + g_assert_nonnull (ret); + + value = (gboolean) GPOINTER_TO_INT (ret); + g_assert_true (value); + + g_assert_true (dzl_task_cache_evict (cache, "foo")); + + g_main_loop_quit (main_loop); +} + +static void +test_task_cache_raw_value (void) +{ + main_loop = g_main_loop_new (NULL, FALSE); + cache = dzl_task_cache_new (g_str_hash, + g_str_equal, + (GBoxedCopyFunc)g_strdup, + (GBoxedFreeFunc)g_free, + NULL, + NULL, + 100 /* msec */, + populate_callback_raw_value, NULL, NULL); + + g_assert_null (dzl_task_cache_peek (cache, "foo")); + g_assert_false (dzl_task_cache_evict (cache, "foo")); + + dzl_task_cache_get_async (cache, "foo", TRUE, NULL, get_foo_raw_value_cb, NULL); + + g_main_loop_run (main_loop); + g_main_loop_unref (main_loop); } gint @@ -64,5 +116,6 @@ { g_test_init (&argc, &argv, NULL); g_test_add_func ("/Dazzle/TaskCache/basic", test_task_cache); + g_test_add_func ("/Dazzle/TaskCache/raw-value", test_task_cache_raw_value); return g_test_run (); }
