diff options
| -rw-r--r-- | archiver/ChangeLog | 10 | ||||
| -rw-r--r-- | archiver/Makefile.am | 24 | ||||
| -rw-r--r-- | archiver/rollback-location-management.glade | 647 | ||||
| -rw-r--r-- | archiver/ximian_archiverConf.sh.in | 6 |
4 files changed, 25 insertions, 662 deletions
diff --git a/archiver/ChangeLog b/archiver/ChangeLog index 5d80af07b..08fa29db5 100644 --- a/archiver/ChangeLog +++ b/archiver/ChangeLog @@ -2,6 +2,16 @@ * 0.5 RELEASE +2001-05-24 Chema Celorio <chema@celorio.com> + + * Makefile.am (libximian_archiver_la_SOURCES): add config- + manger-dialog so that distcheck would pass + (SUBDIRS): add the . dir because the capplet depends on + the archiver and we need to build the archiver first + (libximian_archiver_la_SOURCES): add location-list & + create-location-dialog + (ximian_archiverConf.sh): change to XIMIAN_ARVHIER_FOO + 2001-05-24 Bradford Hovinen <hovinen@ximian.com> * Makefile.am (SUBDIRS): Added location-manager-capplet diff --git a/archiver/Makefile.am b/archiver/Makefile.am index fff218c2f..2dae126fb 100644 --- a/archiver/Makefile.am +++ b/archiver/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = location-manager-capplet +SUBDIRS = . location-manager-capplet confexecdir = $(libdir) confexec_DATA = ximian_archiverConf.sh @@ -6,9 +6,6 @@ confexec_DATA = ximian_archiverConf.sh Locationmetadir = $(datadir)/ximian-config/default Locationmeta_DATA = default-user.xml default-global.xml -gladedir = $(prefix)/share/hcm/glade -glade_DATA = rollback-location-management.glade - includedir = $(prefix)/include/ximian-archiver INCLUDES = \ @@ -18,7 +15,7 @@ INCLUDES = \ -DG_LOG_DOMAIN=\"libximian-archiver\" \ -DCONFIGDIR=\""/etc"\" \ -DLOCATION_DIR=\""$(datadir)/ximian-config/default"\" \ - -DGLADE_DIR=\""$(datadir)/ximian-config/glade"\" \ + -DGLADE_DIR=\""$(INTERFACES_DIR)"\" \ -DXST_BACKEND_LOCATION=\""$(datadir)/ximian-setup-tools/scripts"\" \ $(GNOME_XML_CFLAGS) \ $(LIBGLADE_CFLAGS) @@ -30,11 +27,16 @@ libximian_archiver_la_SOURCES = \ archive.c archive.h \ location.c location.h \ config-log.c config-log.h \ + create-location-dialog.c create-location-dialog.h \ + location-list.c location-list.h \ backend-list.c backend-list.h \ cluster.c cluster.h \ cluster-location.c cluster-location.h \ + config-manager-dialog.c config-manager-dialog.h \ util.c util.h +libximian_archiver_la_LIBADD = $(XIMIAN_ARCHIVER_LIBS) + include_HEADERS = \ archive.h \ location.h \ @@ -48,15 +50,14 @@ ximian_archiver_SOURCES = \ main.c ximian_archiver_LDADD = \ - $(GNOME_LIBDIR) \ - $(GNOMEUI_LIBS) \ + $(GNOME_LIBDIR) \ + $(GNOMEUI_LIBS) \ $(INTLLIBS) \ $(GNOME_XML_LIB) \ libximian_archiver.la EXTRA_DIST = \ $(Locationmeta_DATA) \ - $(glade_DATA) \ ximian_archiverConf.sh.in # @@ -64,10 +65,9 @@ EXTRA_DIST = \ # ximian_archiverConf.sh: ximian_archiverConf.sh.in Makefile sed -e 's?\@VERSION\@?$(VERSION)?' \ - -e 's?\@GNOME_LIBDIR\@?$(GNOME_LIBDIR) -L$(prefix)/lib?' \ - -e 's?\@GNOMEUI_LIBS\@?$(GNOMEUI_LIBS)?g' \ - -e 's?\@GNOME_INCLUDEDIR\@?$(GNOME_INCLUDEDIR) -I$(prefix)/include?g' \ - -e 's?\@ORB_LIBS\@?$(ORB_LIBS)?g' \ + -e 's?\@XIMIAN_ARCHIVER_LIBDIR\@?$(XIMIAN_ARCHIVER_LIBDIR)?g' \ + -e 's?\@XIMIAN_ARCHIVER_LIBS\@?$(XIMIAN_ARCHIVER_LIBS)?g' \ + -e 's?\@XIMIAN_ARCHIVER_INCLUDEDIR\@?$(XIMIAN_ARCHIVER_INCLUDEDIR)?g' \ < $(srcdir)/ximian_archiverConf.sh.in > ximian_archiverConf.tmp \ && mv ximian_archiverConf.tmp ximian_archiverConf.sh diff --git a/archiver/rollback-location-management.glade b/archiver/rollback-location-management.glade deleted file mode 100644 index cc1289329..000000000 --- a/archiver/rollback-location-management.glade +++ /dev/null @@ -1,647 +0,0 @@ -<?xml version="1.0"?> -<GTK-Interface> - -<project> - <name>Rollback-location-management</name> - <program_name>rollback-location-management</program_name> - <directory></directory> - <source_directory>src</source_directory> - <pixmaps_directory>pixmaps</pixmaps_directory> - <language>C</language> - <gnome_support>True</gnome_support> - <gettext_support>True</gettext_support> -</project> - -<widget> - <class>GnomeDialog</class> - <name>rollback_location_dialog</name> - <type>GTK_WINDOW_TOPLEVEL</type> - <position>GTK_WIN_POS_NONE</position> - <modal>False</modal> - <allow_shrink>False</allow_shrink> - <allow_grow>True</allow_grow> - <auto_shrink>False</auto_shrink> - <auto_close>False</auto_close> - <hide_on_close>False</hide_on_close> - - <widget> - <class>GtkVBox</class> - <child_name>GnomeDialog:vbox</child_name> - <name>dialog-vbox1</name> - <homogeneous>False</homogeneous> - <spacing>8</spacing> - <child> - <padding>4</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkHButtonBox</class> - <child_name>GnomeDialog:action_area</child_name> - <name>dialog-action_area1</name> - <layout_style>GTK_BUTTONBOX_END</layout_style> - <spacing>8</spacing> - <child_min_width>85</child_min_width> - <child_min_height>27</child_min_height> - <child_ipad_x>7</child_ipad_x> - <child_ipad_y>0</child_ipad_y> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - <pack>GTK_PACK_END</pack> - </child> - - <widget> - <class>GtkButton</class> - <name>button1</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_OK</stock_button> - </widget> - - <widget> - <class>GtkButton</class> - <name>button2</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button> - </widget> - - <widget> - <class>GtkButton</class> - <name>button3</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button> - </widget> - </widget> - - <widget> - <class>GtkNotebook</class> - <name>config_dialog_data</name> - <can_focus>True</can_focus> - <show_tabs>True</show_tabs> - <show_border>True</show_border> - <tab_pos>GTK_POS_TOP</tab_pos> - <scrollable>False</scrollable> - <tab_hborder>2</tab_hborder> - <tab_vborder>2</tab_vborder> - <popup_enable>False</popup_enable> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkTable</class> - <name>table1</name> - <border_width>5</border_width> - <rows>4</rows> - <columns>2</columns> - <homogeneous>False</homogeneous> - <row_spacing>5</row_spacing> - <column_spacing>5</column_spacing> - - <widget> - <class>GtkRadioButton</class> - <name>rollback_all_toggle</name> - <can_focus>True</can_focus> - <signal> - <name>toggled</name> - <handler>rollback_all_toggled_cb</handler> - <last_modification_time>Tue, 19 Dec 2000 20:58:48 GMT</last_modification_time> - </signal> - <label>Restore all tools</label> - <active>False</active> - <draw_indicator>True</draw_indicator> - <group>restore_type</group> - <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>1</top_attach> - <bottom_attach>2</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> - <class>GtkButton</class> - <name>button4</name> - <can_focus>True</can_focus> - <label>View Logs...</label> - <relief>GTK_RELIEF_NORMAL</relief> - <child> - <left_attach>0</left_attach> - <right_attach>1</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> - <class>GtkButton</class> - <name>button5</name> - <can_focus>True</can_focus> - <label>Advanced...</label> - <relief>GTK_RELIEF_NORMAL</relief> - <child> - <left_attach>1</left_attach> - <right_attach>2</right_attach> - <top_attach>3</top_attach> - <bottom_attach>4</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>False</yfill> - </child> - </widget> - - <widget> - <class>GtkHBox</class> - <name>hbox2</name> - <homogeneous>False</homogeneous> - <spacing>0</spacing> - <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>2</top_attach> - <bottom_attach>3</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>False</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> - - <widget> - <class>GtkRadioButton</class> - <name>rollback_one_toggle</name> - <can_focus>True</can_focus> - <signal> - <name>toggled</name> - <handler>rollback_one_toggled_cb</handler> - <last_modification_time>Tue, 19 Dec 2000 20:58:59 GMT</last_modification_time> - </signal> - <label>Restore only</label> - <active>False</active> - <draw_indicator>True</draw_indicator> - <group>restore_type</group> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkOptionMenu</class> - <name>backend_select</name> - <can_focus>True</can_focus> - <items></items> - <initial_choice>0</initial_choice> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - </widget> - </widget> - - <widget> - <class>GtkHBox</class> - <name>hbox1</name> - <homogeneous>False</homogeneous> - <spacing>5</spacing> - <child> - <left_attach>0</left_attach> - <right_attach>2</right_attach> - <top_attach>0</top_attach> - <bottom_attach>1</bottom_attach> - <xpad>0</xpad> - <ypad>0</ypad> - <xexpand>True</xexpand> - <yexpand>False</yexpand> - <xshrink>False</xshrink> - <yshrink>False</yshrink> - <xfill>True</xfill> - <yfill>True</yfill> - </child> - - <widget> - <class>GtkLabel</class> - <name>label3</name> - <label>Restore configuration from</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkSpinButton</class> - <name>time_count</name> - <can_focus>True</can_focus> - <signal> - <name>changed</name> - <handler>time_count_changed_cb</handler> - <last_modification_time>Tue, 19 Dec 2000 20:15:27 GMT</last_modification_time> - </signal> - <climb_rate>1</climb_rate> - <digits>0</digits> - <numeric>False</numeric> - <update_policy>GTK_UPDATE_ALWAYS</update_policy> - <snap>False</snap> - <wrap>False</wrap> - <value>1</value> - <lower>0</lower> - <upper>1000</upper> - <step>1</step> - <page>10</page> - <page_size>10</page_size> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label4</name> - <label>days ago</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - </widget> - </widget> - - <widget> - <class>GtkLabel</class> - <child_name>Notebook:tab</child_name> - <name>label1</name> - <label>Configuration Restoration</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - </widget> - - <widget> - <class>GtkHBox</class> - <name>location_tree_box</name> - <border_width>5</border_width> - <homogeneous>False</homogeneous> - <spacing>5</spacing> - - <widget> - <class>GtkVBox</class> - <name>vbox1</name> - <homogeneous>False</homogeneous> - <spacing>5</spacing> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - <pack>GTK_PACK_END</pack> - </child> - - <widget> - <class>GtkButton</class> - <name>create_button</name> - <can_focus>True</can_focus> - <signal> - <name>clicked</name> - <handler>create_cb</handler> - <last_modification_time>Wed, 20 Dec 2000 23:51:41 GMT</last_modification_time> - </signal> - <label>Create...</label> - <relief>GTK_RELIEF_NORMAL</relief> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkButton</class> - <name>destroy_button</name> - <can_focus>True</can_focus> - <signal> - <name>clicked</name> - <handler>destroy_cb</handler> - <last_modification_time>Wed, 20 Dec 2000 23:51:56 GMT</last_modification_time> - </signal> - <label>Destroy...</label> - <relief>GTK_RELIEF_NORMAL</relief> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkButton</class> - <name>rename_button</name> - <can_focus>True</can_focus> - <signal> - <name>clicked</name> - <handler>rename_cb</handler> - <last_modification_time>Wed, 20 Dec 2000 23:52:13 GMT</last_modification_time> - </signal> - <label>Rename...</label> - <relief>GTK_RELIEF_NORMAL</relief> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkHSeparator</class> - <name>hseparator1</name> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> - </widget> - - <widget> - <class>GtkButton</class> - <name>change_location_button</name> - <can_focus>True</can_focus> - <signal> - <name>clicked</name> - <handler>change_location_cb</handler> - <last_modification_time>Wed, 20 Dec 2000 23:52:33 GMT</last_modification_time> - </signal> - <label>Change to this Location</label> - <relief>GTK_RELIEF_NORMAL</relief> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkButton</class> - <name>edit_button</name> - <can_focus>True</can_focus> - <signal> - <name>clicked</name> - <handler>edit_location_cb</handler> - <last_modification_time>Wed, 20 Dec 2000 23:52:51 GMT</last_modification_time> - </signal> - <label>Edit this Location</label> - <relief>GTK_RELIEF_NORMAL</relief> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - </widget> - - <widget> - <class>GtkScrolledWindow</class> - <name>location_tree_location</name> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - <pack>GTK_PACK_END</pack> - </child> - - <widget> - <class>Placeholder</class> - </widget> - </widget> - </widget> - - <widget> - <class>GtkLabel</class> - <child_name>Notebook:tab</child_name> - <name>label2</name> - <label>Location Management</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - </widget> - </widget> - </widget> -</widget> - -<widget> - <class>GnomeDialog</class> - <name>create_location_dialog</name> - <type>GTK_WINDOW_TOPLEVEL</type> - <position>GTK_WIN_POS_NONE</position> - <modal>False</modal> - <allow_shrink>False</allow_shrink> - <allow_grow>False</allow_grow> - <auto_shrink>False</auto_shrink> - <auto_close>False</auto_close> - <hide_on_close>False</hide_on_close> - - <widget> - <class>GtkVBox</class> - <child_name>GnomeDialog:vbox</child_name> - <name>dialog-vbox2</name> - <homogeneous>False</homogeneous> - <spacing>8</spacing> - <child> - <padding>4</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkHButtonBox</class> - <child_name>GnomeDialog:action_area</child_name> - <name>dialog-action_area2</name> - <layout_style>GTK_BUTTONBOX_END</layout_style> - <spacing>8</spacing> - <child_min_width>85</child_min_width> - <child_min_height>27</child_min_height> - <child_ipad_x>7</child_ipad_x> - <child_ipad_y>0</child_ipad_y> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - <pack>GTK_PACK_END</pack> - </child> - - <widget> - <class>GtkButton</class> - <name>button11</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_OK</stock_button> - </widget> - - <widget> - <class>GtkButton</class> - <name>button12</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_APPLY</stock_button> - </widget> - - <widget> - <class>GtkButton</class> - <name>button13</name> - <can_default>True</can_default> - <can_focus>True</can_focus> - <stock_button>GNOME_STOCK_BUTTON_CANCEL</stock_button> - </widget> - </widget> - - <widget> - <class>GtkVBox</class> - <name>create_dialog_data</name> - <homogeneous>False</homogeneous> - <spacing>5</spacing> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkHBox</class> - <name>hbox4</name> - <homogeneous>False</homogeneous> - <spacing>5</spacing> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>GtkLabel</class> - <name>label7</name> - <label>Location name:</label> - <justify>GTK_JUSTIFY_CENTER</justify> - <wrap>False</wrap> - <xalign>0.5</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>False</fill> - </child> - </widget> - - <widget> - <class>GtkEntry</class> - <name>location_name_entry</name> - <can_focus>True</can_focus> - <editable>True</editable> - <text_visible>True</text_visible> - <text_max_length>0</text_max_length> - <text></text> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - </widget> - </widget> - - <widget> - <class>GtkLabel</class> - <name>label8</name> - <label>Parent Location:</label> - <justify>GTK_JUSTIFY_LEFT</justify> - <wrap>False</wrap> - <xalign>0</xalign> - <yalign>0.5</yalign> - <xpad>0</xpad> - <ypad>0</ypad> - <child> - <padding>0</padding> - <expand>False</expand> - <fill>True</fill> - </child> - </widget> - - <widget> - <class>GtkScrolledWindow</class> - <name>location_list_location</name> - <hscrollbar_policy>GTK_POLICY_NEVER</hscrollbar_policy> - <vscrollbar_policy>GTK_POLICY_AUTOMATIC</vscrollbar_policy> - <hupdate_policy>GTK_UPDATE_CONTINUOUS</hupdate_policy> - <vupdate_policy>GTK_UPDATE_CONTINUOUS</vupdate_policy> - <child> - <padding>0</padding> - <expand>True</expand> - <fill>True</fill> - </child> - - <widget> - <class>Placeholder</class> - </widget> - </widget> - </widget> - </widget> -</widget> - -</GTK-Interface> diff --git a/archiver/ximian_archiverConf.sh.in b/archiver/ximian_archiverConf.sh.in index c61b47b6c..ec99aa4c5 100644 --- a/archiver/ximian_archiverConf.sh.in +++ b/archiver/ximian_archiverConf.sh.in @@ -1,4 +1,4 @@ -XIMIAN_ARCHIVER_LIBDIR="@GNOME_LIBDIR@" -XIMIAN_ARCHIVER_LIBS="-lximian_archiver @GNOMEUI_LIBS@" -XIMIAN_ARCHIVER_INCLUDEDIR="@GNOME_INCLUDEDIR@" +XIMIAN_ARCHIVER_LIBDIR="@XIMIAN_ARCHIVER_LIBDIR@" +XIMIAN_ARCHIVER_LIBS="@XIMIAN_ARCHIVER_LIBS@" +XIMIAN_ARCHIVER_INCLUDEDIR="@XIMIAN_ARCHIVER_INCLUDEDIR@" MODULE_VERSION="ximian-archiver-@VERSION@"
\ No newline at end of file |