Add back missing gnome2-console files

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@752 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 03d953dc59183d73f26c1628e18f9eb780f21096..8ec3a6c17fa28f11999e5d965bc05cdfb5b5667d 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -179,9 +179,9 @@ if test x$support_gnome = xyes; then
      AC_SUBST(GNOMEUI_LIBS)
      AC_SUBST(GNOME_LIBDIR)
      AC_SUBST(GNOME_LIBS)
-     GNOME_DIR=src/gnome-console
+     GNOME_DIR=src/gnome2-console
   else
-dnl 1.4 stuff
+dnl do 1.4 stuff
     GNOME_INIT
     GNOME_DIR=src/gnome-console
   fi

diff --git a/bacula/configure b/bacula/configure
index 3cae1343bdef436e46b4d06f1514a4f6308a7620..ed3d85bb9b4af9ca84ada75c0e7cfdbc4d90d9b5 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -4348,7 +4348,7 @@ if test x$support_gnome = xyes; then
 
 
 
-     GNOME_DIR=src/gnome-console
+     GNOME_DIR=src/gnome2-console
   else
 
 

diff --git a/bacula/src/gnome2-console/callbacks.h b/bacula/src/gnome2-console/callbacks.h
new file mode 100644 (file)
index 0000000..184ba9c
--- /dev/null
+++ b/bacula/src/gnome2-console/callbacks.h
@@ -0,0 +1,240 @@
+
+/*   Version $Id$  */
+
+gboolean
+on_app1_delete_event                   (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+on_new_file1_activate                  (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_open1_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_save1_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_save_as1_activate                   (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_exit1_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_cut1_activate                       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_copy1_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_paste1_activate                     (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_clear1_activate                     (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_properties1_activate                (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_preferences1_activate               (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_about1_activate                     (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_about1_clicked                      (GnomeDialog     *gnomedialog,
+                                        gint             arg1,
+                                        gpointer         user_data);
+
+gboolean
+on_entry1_key_press_event              (GtkWidget       *widget,
+                                        GdkEventKey     *event,
+                                        gpointer         user_data);
+
+gboolean
+on_app1_key_press_event                (GtkWidget       *widget,
+                                        GdkEventKey     *event,
+                                        gpointer         user_data);
+
+void
+on_select_director_clicked             (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_connect_button1_clicked             (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_app1_realize                        (GtkWidget       *widget,
+                                        gpointer         user_data);
+
+gboolean
+on_combo_entry1_key_press_event        (GtkWidget       *widget,
+                                        GdkEventKey     *event,
+                                        gpointer         user_data);
+
+gboolean
+on_entry1_key_press_event              (GtkWidget       *widget,
+                                        GdkEventKey     *event,
+                                        gpointer         user_data);
+
+gboolean
+on_entry1_key_press_event              (GtkWidget       *widget,
+                                        GdkEventKey     *event,
+                                        gpointer         user_data);
+
+void
+on_app1_show                           (GtkWidget       *widget,
+                                        gpointer         user_data);
+
+void
+on_connect_button1_clicked             (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_run_button1_clicked                 (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_msgs_button_clicked                 (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_msgs_activate                       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_run_button_clicked                  (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_disconnect_activate                 (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_about_activate                      (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_connect_button_clicked              (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_connect_activate                    (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_exit_activate                       (GtkMenuItem     *menuitem,
+                                        gpointer         user_data);
+
+void
+on_about_clicked                       (GnomeDialog     *gnomedialog,
+                                        gint             arg1,
+                                        gpointer         user_data);
+
+gboolean
+on_app2_delete_event                   (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+on_app2_show                           (GtkWidget       *widget,
+                                        gpointer         user_data);
+
+gboolean
+on_app1_delete_event                   (GtkWidget       *widget,
+                                        GdkEvent        *event,
+                                        gpointer         user_data);
+
+void
+on_app1_show                           (GtkWidget       *widget,
+                                        gpointer         user_data);
+
+gboolean
+on_entry1_key_press_event              (GtkWidget       *widget,
+                                        GdkEventKey     *event,
+                                        gpointer         user_data);
+
+void
+on_about_button_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_select_director_OK_clicked          (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_select_director_cancel_clicked      (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_run_ok_clicked                      (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_run_cancel_clicked                  (GtkButton       *button,
+                                        gpointer         user_data);
+
+gboolean
+on_entry1_key_release_event            (GtkWidget       *widget,
+                                        GdkEventKey     *event,
+                                        gpointer         user_data);
+
+void
+on_restore_button_clicked              (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_type_combo_selection_received       (GtkWidget       *widget,
+                                        GtkSelectionData *data,
+                                        guint            time,
+                                        gpointer         user_data);
+
+void
+on_view_fileset_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_entry_job_changed                   (GtkEditable     *editable,
+                                        gpointer         user_data);
+
+void
+on_restore_ok_clicked                  (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_restore_cancel_clicked              (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_apply_button_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_restore_file_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_label_button_clicked                (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_label_ok_clicked                    (GtkButton       *button,
+                                        gpointer         user_data);
+
+void
+on_label_cancel_clicked                (GtkButton       *button,
+                                        gpointer         user_data);

diff --git a/bacula/src/gnome2-console/console.h b/bacula/src/gnome2-console/console.h
new file mode 100644 (file)
index 0000000..200ca32
--- /dev/null
+++ b/bacula/src/gnome2-console/console.h
@@ -0,0 +1,61 @@
+/*
+ * Bacula GNOME User Agent specific configuration and defines
+ *
+ *     Kern Sibbald, March 2002
+ *
+ *     Version $Id$
+ */
+
+#ifndef __CONSOLE_H_
+#define __CONSOLE_H_
+
+#include "console_conf.h"
+#include "jcr.h"
+/* Super kludge for GNOME 2.0 */
+#undef _
+#undef N_
+#undef textdomain
+
+#include <gnome.h>
+
+extern GtkWidget *app1;       /* application window */
+extern GtkWidget *text1;      /* text window */
+extern GtkWidget *entry1;     /* entry box */
+extern GtkWidget *combo1;     /* Directory combo */
+extern GtkWidget *dir_dialog; 
+extern GtkWidget *dir_select;
+extern GtkWidget *run_dialog;       /* run dialog */
+extern GtkWidget *label_dialog;     
+extern GtkWidget *restore_dialog;   /* restore dialog */
+extern GtkWidget *restore_files;    /* restore files dialog */
+extern GtkWidget *about1;
+extern GList *job_list, *client_list, *fileset_list;
+extern GList *messages_list, *pool_list, *storage_list;
+extern GList *type_list, *level_list;
+
+
+extern pthread_mutex_t cmd_mutex;
+extern pthread_cond_t  cmd_wait;
+extern char cmd[1000];
+extern int cmd_ready;
+extern int reply;
+extern BSOCK *UA_sock;
+
+
+
+#define OK     1
+#define CANCEL 0
+
+void set_textf(char *fmt, ...);
+void set_text(char *buf, int len);
+void set_status(char *buf);
+void set_status_ready();
+void set_statusf(char *fmt, ...);
+int connect_to_director(gpointer data);
+int disconnect_from_director(gpointer data);
+void start_director_reader(gpointer data);
+void stop_director_reader(gpointer data);
+void write_director(gchar *msg);
+void read_director(gpointer data, gint fd, GdkInputCondition condition);
+
+#endif

diff --git a/bacula/src/gnome2-console/console_conf.h b/bacula/src/gnome2-console/console_conf.h
new file mode 100644 (file)
index 0000000..b63d20c
--- /dev/null
+++ b/bacula/src/gnome2-console/console_conf.h
@@ -0,0 +1,60 @@
+/*
+ * Bacula GNOME User Agent specific configuration and defines
+ *
+ *     Kern Sibbald, March 2002
+ *
+ *     Version $Id$
+ */
+
+#ifndef __CONSOLE_CONF_H_
+#define __CONSOLE_CONF_H_
+
+/*
+ * Resource codes -- they must be sequential for indexing   
+ */
+#define R_FIRST                      1001
+
+#define R_DIRECTOR                   1001
+#define R_CONSOLE                    1002
+
+#define R_LAST                       R_CONSOLE
+
+/*
+ * Some resource attributes
+ */
+#define R_NAME                       1020
+#define R_ADDRESS                    1021
+#define R_PASSWORD                   1022
+#define R_TYPE                       1023
+#define R_BACKUP                     1024
+
+
+/* Definition of the contents of each Resource */
+struct s_res_dir {
+   RES  hdr;
+   int  DIRport;                     /* UA server port */
+   char *address;                    /* UA server address */
+   char *password;                   /* UA server password */
+   int enable_ssl;                   /* Use SSL */
+};
+typedef struct s_res_dir DIRRES;
+
+struct s_con_dir {
+   RES  hdr;
+   char *fontface;                   /* Console Font specification */
+   int require_ssl;                  /* Require SSL on all connections */
+};
+typedef struct s_con_dir CONRES;
+
+/* Define the Union of all the above
+ * resource structure definitions.
+ */
+union u_res {
+   struct s_res_dir    res_dir;
+   struct s_con_dir    con_dir;
+   RES hdr;
+};
+
+typedef union u_res URES;
+
+#endif

diff --git a/bacula/src/gnome2-console/gnome-console.conf.in b/bacula/src/gnome2-console/gnome-console.conf.in
new file mode 100644 (file)
index 0000000..8ca3533
--- /dev/null
+++ b/bacula/src/gnome2-console/gnome-console.conf.in
@@ -0,0 +1,15 @@
+#
+# Bacula User Agent (or Console) Configuration File
+#
+
+Director {
+  Name = @hostname@-dir
+  DIRport = @dir_port@
+  address = @hostname@
+  Password = "@dir_password@"
+}
+
+ConsoleFont {
+  Name = Default
+  Font = "-misc-fixed-medium-r-normal-*-*-130-*-*-c-*-iso8859-1"
+}

diff --git a/bacula/src/gnome2-console/interface.h b/bacula/src/gnome2-console/interface.h
new file mode 100644 (file)
index 0000000..f9853e1
--- /dev/null
+++ b/bacula/src/gnome2-console/interface.h
@@ -0,0 +1,11 @@
+/*
+ * DO NOT EDIT THIS FILE - it is generated by Glade.
+ */
+
+GtkWidget* create_app1 (void);
+GtkWidget* create_about1 (void);
+GtkWidget* create_SelectDirectorDialog (void);
+GtkWidget* create_RunDialog (void);
+GtkWidget* create_restore_files (void);
+GtkWidget* create_restore_dialog (void);
+GtkWidget* create_label_dialog (void);

diff --git a/bacula/src/gnome2-console/test-gnome-console.conf b/bacula/src/gnome2-console/test-gnome-console.conf
new file mode 100644 (file)
index 0000000..b2725a1
--- /dev/null
+++ b/bacula/src/gnome2-console/test-gnome-console.conf
@@ -0,0 +1,10 @@
+#
+# Bacula User Agent (or Console) Configuration File
+#
+
+Director {
+  Name = rufus-dir
+  DIRport = 8101
+  address = rufus
+  Password = UA_password
+}