1.5.7GNOME_CONTROL_CENTER_1_5_7

2001-08-29  Bradford Hovinen  <hovinen@ximian.com>

        * RELEASE : 1.5.7

        * archive.c (foreach_build_list_cb): Don't unref the location if
        it is deleted
        (load_all_locations): Check if the location is marked deleted and
        throw it away if so

        * location.c (location_new): Don't unref parent location

4 files changed, 170 insertions, 62 deletions

diff --git a/capplets/background/Makefile.am b/capplets/background/Makefile.am
index c978c7b6e..11de9b297 100644
--- a/capplets/background/Makefile.am
+++ b/capplets/background/Makefile.am
@@ -63,4 +63,3 @@ Glade_DATA = $(cappletname)-properties.glade
 icons_DATA = $(cappletname)-capplet.png
 desktop    = $(cappletname).desktop
 all-local: $(desktop) $(oaffile)
-
diff --git a/capplets/rollback/Makefile.am b/capplets/rollback/Makefile.am
index d01672628..8f24f0e6b 100644
--- a/capplets/rollback/Makefile.am
+++ b/capplets/rollback/Makefile.am
@@ -1,35 +1,32 @@
-Applicationsdir = $(datadir)/control-center/capplets
-Applications_in_files = rollback.desktop.in
-Applications_DATA = $(Applications_in_files:.desktop.in=.desktop)
-@XML_I18N_MERGE_DESKTOP_RULE@
+cappletname = rollback
+cappletgroup = 
 
-pApplicationsdir = $(datadir)/gnome/apps/Settings/Desktop
-pApplications_DATA = $(Applications_DATA)
+bin_PROGRAMS = rollback-capplet
 
-Gladedir = $(datadir)/control-center-data
-Glade_DATA = \
-	rollback.glade
+rollback_capplet_LDADD = $(GNOMECC_CAPPLETS_LIBS)
 
-EXTRA_DIST = $(Applications_DATA) $(Glade_DATA)
+rollback_capplet_SOURCES = \
+	rollback-capplet-widget.c	rollback-capplet-widget.h		\
+	main.c
 
-INCLUDES = \
-        -DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-DGNOME_ICONDIR=\""${prefix}/share/pixmaps"\"	\
-	-DG_LOG_DOMAIN=\"background-properties\"	\
-	-DGLADE_DATADIR=\""$(Gladedir)"\"		\
-	@ROLLBACK_CAPPLET_CFLAGS@			\
-	-I$(top_srcdir)/				\
-	-I$(top_srcdir)/intl				\
-	-I$(top_srcdir)/archiver
+####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
+$(desktop).in: %.desktop.in: %.desktop.in.in
+	sed -e "s#@DESKTOP_EXEC_LINE@#$(DESKTOP_EXEC_LINE)#" -e "s#Icon=.*#Icon=$(GNOMECC_ICONS_DIR)/${cappletname}-capplet.png#" < $< > ${cappletname}.desktop.in
 
-bin_PROGRAMS = rollback-capplet
+install-data-local:
+	$(mkinstalldirs) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)
+	$(INSTALL_DATA) $(desktop) $(DESTDIR)$(datadir)/control-center/capplets/$(cappletgroup)$(desktop)
 
-rollback_capplet_SOURCES = \
-	config-manager-dialog.c	config-manager-dialog.h		\
-	rollback-widget.c	rollback-widget.h		\
-	rollback-control.c	rollback-control.h		\
-	main.c
+install-data-am: install-data-local
+####@###GNOMECC_CAPPLETS_DESKTOP_IN_RULE@
 
-rollback_capplet_LDADD = \
-	$(top_builddir)/archiver/libconfig_archiver.la		\
-	@ROLLBACK_CAPPLET_LIBS@
+INCLUDES   = $(GNOMECC_CAPPLETS_CFLAGS)
+CLEANFILES = $(GNOMECC_CAPPLETS_CLEANFILES)
+EXTRA_DIST = $(GNOMECC_CAPPLETS_EXTRA_DIST) $(defaults_DATA)
+iconsdir   = $(GNOMECC_ICONS_DIR)
+Gladedir   = $(GNOMECC_GLADE_DIR)
+pixmapdir  = $(GNOMECC_PIXMAPS_DIR)
+Glade_DATA = $(cappletname).glade
+icons_DATA = $(cappletname)-capplet.png
+desktop    = $(cappletname).desktop
+all-local: $(desktop)
diff --git a/capplets/rollback/main.c b/capplets/rollback/main.c
index addd13c08..a455ceaff 100644
--- a/capplets/rollback/main.c
+++ b/capplets/rollback/main.c
@@ -1,6 +1,6 @@
 /* -*- mode: c; style: linux -*- */
 
-/* config-manager.c
+/* main.c
  * Copyright (C) 2000-2001 Ximian, Inc.
  *
  * Written by Bradford Hovinen <hovinen@ximian.com>
@@ -28,11 +28,14 @@
 #include <gnome.h>
 #include <glade/glade.h>
 
-#include "config-manager-dialog.h"
+#include "rollback-capplet-dialog.h"
 
 static gboolean is_global;
+static gchar *capplet_name;
 
 static struct poptOption rollback_options[] = {
+	{"capplet", 'c', POPT_ARG_STRING, &capplet_name, 0,
+	 N_("Rollback the capplet given")},
 	{"global", 'g', POPT_ARG_NONE, &is_global, 0,
 	 N_("Operate on global backends")},
 	{NULL, '\0', 0, NULL, 0}
@@ -52,14 +55,18 @@ main (int argc, char **argv)
 	gnome_init ("config-manager", VERSION, argc, argv);
 	glade_gnome_init ();
 
-	dialog = config_manager_dialog_new
-		(is_global ? CM_DIALOG_GLOBAL : CM_DIALOG_USER);
-	gtk_widget_show (dialog);
+	orb = oaf_init (argc, argv);
+	if (bonobo_init (orb, CORBA_OBJECT_NIL, CORBA_OBJECT_NIL) == FALSE)
+		g_error ("Cannot initialize bonobo");
 
-	gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
-			    gtk_main_quit, NULL);
+	if (capplet_name != NULL) {
+		dialog = rollback_capplet_dialog_new (capplet_name);
 
-	gtk_main ();
+		gtk_signal_connect (GTK_OBJECT (dialog), "destroy",
+				    gtk_main_quit, NULL);
+	}
+
+	bonobo_main ();
 
 	return 0;
 }
diff --git a/capplets/rollback/rollback.glade b/capplets/rollback/rollback.glade
index cd1bedbd3..1b5d14969 100644
--- a/capplets/rollback/rollback.glade
+++ b/capplets/rollback/rollback.glade
@@ -139,6 +139,7 @@
 	  <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>
@@ -160,6 +161,7 @@
 	  <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>
@@ -356,6 +358,7 @@
 	      <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>
@@ -373,6 +376,7 @@
 	      <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>
@@ -390,6 +394,7 @@
 	      <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>
@@ -417,6 +422,7 @@
 	      <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>
@@ -434,6 +440,7 @@
 	      <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>
@@ -480,7 +487,7 @@
 
 <widget>
   <class>GnomeDialog</class>
-  <name>rollback_dialog</name>
+  <name>rollback_dialog_backup</name>
   <title>Restore old configuration</title>
   <type>GTK_WINDOW_TOPLEVEL</type>
   <position>GTK_WIN_POS_NONE</position>
@@ -724,40 +731,138 @@
 	  </child>
 	</widget>
       </widget>
+    </widget>
+  </widget>
+</widget>
+
+<widget>
+  <class>GnomeDialog</class>
+  <name>rollback_dialog_win</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-vbox4</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_area4</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>GtkHBox</class>
-	<name>hbox6</name>
-	<homogeneous>False</homogeneous>
-	<spacing>5</spacing>
+	<class>GtkButton</class>
+	<name>button17</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>button18</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>button19</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>rollback_dialog</name>
+      <homogeneous>False</homogeneous>
+      <spacing>5</spacing>
+      <child>
+	<padding>0</padding>
+	<expand>True</expand>
+	<fill>True</fill>
+      </child>
+
+      <widget>
+	<class>GtkLabel</class>
+	<name>rollback_level_label</name>
+	<label>Current time</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>False</fill>
+	</child>
+      </widget>
+
+      <widget>
+	<class>GtkHScale</class>
+	<name>rollback_scale</name>
+	<can_focus>True</can_focus>
+	<draw_value>False</draw_value>
+	<value_pos>GTK_POS_TOP</value_pos>
+	<digits>0</digits>
+	<policy>GTK_UPDATE_DISCONTINUOUS</policy>
+	<value>0</value>
+	<lower>0</lower>
+	<upper>0</upper>
+	<step>0</step>
+	<page>0</page>
+	<page_size>0</page_size>
 	<child>
 	  <padding>0</padding>
 	  <expand>True</expand>
 	  <fill>True</fill>
 	</child>
+      </widget>
 
-	<widget>
-	  <class>GtkButton</class>
-	  <name>view_logs_button</name>
-	  <can_focus>True</can_focus>
-	  <label>View Logs...</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
-	</widget>
+      <widget>
+	<class>GtkFrame</class>
+	<name>control_socket</name>
+	<label_xalign>0</label_xalign>
+	<shadow_type>GTK_SHADOW_ETCHED_IN</shadow_type>
+	<child>
+	  <padding>0</padding>
+	  <expand>True</expand>
+	  <fill>True</fill>
+	</child>
 
 	<widget>
-	  <class>GtkButton</class>
-	  <name>advanced_button</name>
-	  <can_focus>True</can_focus>
-	  <label>Advanced...</label>
-	  <child>
-	    <padding>0</padding>
-	    <expand>True</expand>
-	    <fill>True</fill>
-	  </child>
+	  <class>Placeholder</class>
 	</widget>
       </widget>
     </widget>