Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=pacman-g2.git;a=commitdiff;h=1ef3435e47b61ed35d5a6ccbc58ae3833f6ab55b
commit 1ef3435e47b61ed35d5a6ccbc58ae3833f6ab55b Author: Michel Hermier <[email protected]> Date: Mon Aug 4 10:00:28 2014 +0200 libpacman: Added progress events enum symbols. diff --git a/doc/libpacman-changes.txt b/doc/libpacman-changes.txt index b2dd713..7d7e62c 100644 --- a/doc/libpacman-changes.txt +++ b/doc/libpacman-changes.txt @@ -88,6 +88,8 @@ PM_PKG_SCRIPTLET_PATH: Access to package scriptlet path (.install). PM_PKG_TRIGGERS: Access to package triggers list. +PM_TRANS_EVT_FILECONFLICTS_PROGRESS, PM_TRANS_EVT_INTERCONFLICTS_PROGRESS, PM_TRANS_EVT_ADD_PROGRESS, PM_TRANS_EVT_REMOVE_PROGRESS, PM_TRANS_EVT_UPGRADE_PROGRESS: Added in preparation of an unification of event system. Also defines the values for PM_TRANS_PROGRESS_*_START. + PM_TRANS_SYNCPKGS: Access to transaction syncpkgs list. ==== Symbols removed: diff --git a/lib/libpacman/pacman.h b/lib/libpacman/pacman.h index 4cf48cc..f1dc57d 100644 --- a/lib/libpacman/pacman.h +++ b/lib/libpacman/pacman.h @@ -320,7 +320,13 @@ enum { PM_TRANS_EVT_SCRIPTLET_DONE, PM_TRANS_EVT_PRINTURI, PM_TRANS_EVT_RETRIEVE_START, - PM_TRANS_EVT_RETRIEVE_LOCAL + PM_TRANS_EVT_RETRIEVE_LOCAL, + + PM_TRANS_EVT_FILECONFLICTS_PROGRESS, + PM_TRANS_EVT_INTERCONFLICTS_PROGRESS, + PM_TRANS_EVT_ADD_PROGRESS, + PM_TRANS_EVT_REMOVE_PROGRESS, + PM_TRANS_EVT_UPGRADE_PROGRESS, }; /* Transaction Conversations (ie, questions) */ @@ -334,15 +340,6 @@ enum { PM_TRANS_CONV_REMOVE_HOLDPKG = 0x40 }; -/* Transaction Progress */ -enum { - PM_TRANS_PROGRESS_ADD_START, - PM_TRANS_PROGRESS_UPGRADE_START, - PM_TRANS_PROGRESS_REMOVE_START, - PM_TRANS_PROGRESS_CONFLICTS_START, - PM_TRANS_PROGRESS_INTERCONFLICTS_START -}; - /* Transaction Event callback */ typedef void (*pacman_trans_cb_event)(unsigned char, void *, void *); @@ -541,6 +538,15 @@ typedef struct __pmconflict_t PM_CONFLICT; #define pacman_list_next pacman_list_iterator_next #define pacman_list_getdata pacman_list_iterator_getdata +/* Transaction Progress */ +enum { + PM_TRANS_PROGRESS_ADD_START = PM_TRANS_EVT_ADD_PROGRESS, + PM_TRANS_PROGRESS_UPGRADE_START = PM_TRANS_EVT_UPGRADE_PROGRESS, + PM_TRANS_PROGRESS_REMOVE_START = PM_TRANS_EVT_REMOVE_PROGRESS, + PM_TRANS_PROGRESS_CONFLICTS_START = PM_TRANS_EVT_FILECONFLICTS_PROGRESS, + PM_TRANS_PROGRESS_INTERCONFLICTS_START = PM_TRANS_EVT_INTERCONFLICTS_PROGRESS, +}; + #endif /* PACMAN_NO_COMPAT */ #ifdef __cplusplus _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
