Apply James' rename events patch

diff --git a/bacula/src/filed/fd_plugins.h b/bacula/src/filed/fd_plugins.h
index 94ebe828b6ebc476d0bef8c9891b99947fe539ff..5a57ccd20d324552c48a9abe342aa4d326cb4dda 100644 (file)
--- a/bacula/src/filed/fd_plugins.h
+++ b/bacula/src/filed/fd_plugins.h
@@ -156,21 +156,22 @@ typedef enum {
 
 /* Events that are passed to plugin */
 typedef enum {
-  bEventJobStart        = 1,
-  bEventJobEnd          = 2,
-  bEventStartBackupJob  = 3,
-  bEventEndBackupJob    = 4,
-  bEventStartRestoreJob = 5,
-  bEventEndRestoreJob   = 6,
-  bEventStartVerifyJob  = 7,
-  bEventEndVerifyJob    = 8,
-  bEventBackupCommand   = 9,
-  bEventRestoreCommand  = 10,
-  bEventLevel           = 11,
-  bEventSince           = 12,
-  bEventCancelCommand   = 13,
-  bEventInitializeVSS   = 14,
-  bEventPrepareVSS      = 15,
+  bEventJobStart                        = 1,
+  bEventJobEnd                          = 2,
+  bEventStartBackupJob                  = 3,
+  bEventEndBackupJob                    = 4,
+  bEventStartRestoreJob                 = 5,
+  bEventEndRestoreJob                   = 6,
+  bEventStartVerifyJob                  = 7,
+  bEventEndVerifyJob                    = 8,
+  bEventBackupCommand                   = 9,
+  bEventRestoreCommand                  = 10,
+  bEventLevel                           = 11,
+  bEventSince                           = 12,
+  bEventCancelCommand                   = 13,
+  bEventVssBackupAddComponents          = 14,
+  bEventVssRestoreLoadComponentMetadata = 15,
+  bEventVssRestoreSetComponentsSelected = 16,
 } bEventType;
 
 typedef struct s_bEvent {

diff --git a/bacula/src/filed/job.c b/bacula/src/filed/job.c
index 82f6801cde5ba37a5af24feb00ec6aa5acfe2357..20f8fb03133469890c4742544f7f5f9653ca5af9 100644 (file)
--- a/bacula/src/filed/job.c
+++ b/bacula/src/filed/job.c
@@ -1597,7 +1597,7 @@ static int backup_cmd(JCR *jcr)
    /* START VSS ON WIN32 */
    if (jcr->VSS) {      
       if (g_pVSSClient->InitializeForBackup(jcr)) {   
-        generate_plugin_event(jcr, bEventInitializeVSS);
+        generate_plugin_event(jcr, bEventVssBackupAddComponents);
         /* tell vss which drives to snapshot */   
         char szWinDriveLetters[27];   
         if (get_win32_driveletters(jcr->ff, szWinDriveLetters)) {
@@ -1794,10 +1794,10 @@ static bool vss_restore_init_callback(JCR *jcr, int init_type)
    switch (init_type)
    {
    case VSS_INIT_RESTORE_AFTER_INIT:
-      generate_plugin_event(jcr, bEventInitializeVSS);
+      generate_plugin_event(jcr, bEventVssRestoreLoadComponentMetadata);
       return true;
    case VSS_INIT_RESTORE_AFTER_GATHER:
-      generate_plugin_event(jcr, bEventPrepareVSS);
+      generate_plugin_event(jcr, bEventVssRestoreSetComponentsSelected);
       return true;
    default:
       return false;