[pacman-dev] [PATCH v2 2/7] Rename ALPM_EVENT_OPTDEP_REQUIRED to _OPTDEP_REMOVAL

[Olivier Brunel]

Because this event is triggered when an optdepend for another package is
being removed.

Signed-off-by: Olivier Brunel <jjk at jjacky.com>
---
 lib/libalpm/alpm.h    | 2 +-
 lib/libalpm/remove.c  | 2 +-
 src/pacman/callback.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/libalpm/alpm.h b/lib/libalpm/alpm.h
index 5628527..126f50a5 100644
--- a/lib/libalpm/alpm.h
+++ b/lib/libalpm/alpm.h
@@ -377,7 +377,7 @@ typedef enum _alpm_event_t {
 	ALPM_EVENT_DISKSPACE_DONE,
 	/** An optdepend for another package is being removed
 	 * The requiring package and its dependency are passed to the callback */
-	ALPM_EVENT_OPTDEP_REQUIRED,
+	ALPM_EVENT_OPTDEP_REMOVAL,
 	/** A configured repository database is missing */
 	ALPM_EVENT_DATABASE_MISSING,
 	/** Checking keys used to create signatures are in keyring. */
diff --git a/lib/libalpm/remove.c b/lib/libalpm/remove.c
index 899952b..d78c5f1 100644
--- a/lib/libalpm/remove.c
+++ b/lib/libalpm/remove.c
@@ -179,7 +179,7 @@ static void remove_notify_needed_optdepends(alpm_handle_t *handle, alpm_list_t *
 			for(j = optdeps; j; j = alpm_list_next(j)) {
 				alpm_depend_t *optdep = j->data;
 				if(alpm_pkg_find(lp, optdep->name)) {
-					EVENT(handle, ALPM_EVENT_OPTDEP_REQUIRED, pkg, optdep);
+					EVENT(handle, ALPM_EVENT_OPTDEP_REMOVAL, pkg, optdep);
 				}
 			}
 		}
diff --git a/src/pacman/callback.c b/src/pacman/callback.c
index 8c0fab5..4b0f881 100644
--- a/src/pacman/callback.c
+++ b/src/pacman/callback.c
@@ -247,7 +247,7 @@ void cb_event(alpm_event_t event, void *data1, void *data2)
 				printf(_("checking available disk space...\n"));
 			}
 			break;
-		case ALPM_EVENT_OPTDEP_REQUIRED:
+		case ALPM_EVENT_OPTDEP_REMOVAL:
 			colon_printf(_("%s optionally requires %s\n"), alpm_pkg_get_name(data1),
 				alpm_dep_compute_string(data2));
 			break;
-- 
1.8.5.2