#! /bin/sh /usr/share/dpatch/dpatch-run
## 17_ntpdate.dpatch by Vincent Untz <vincent@vuntz.net>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: No description.

@DPATCH@
diff -urNad gnome-system-tools-2.14.0~/interfaces/time.glade.in gnome-system-tools-2.14.0/interfaces/time.glade.in
--- gnome-system-tools-2.14.0~/interfaces/time.glade.in	2006-01-30 23:40:32.000000000 +0100
+++ gnome-system-tools-2.14.0/interfaces/time.glade.in	2006-04-20 18:21:18.000000000 +0200
@@ -177,7 +177,7 @@
 	    <widget class="GtkCheckButton" id="ntp_use">
 	      <property name="visible">True</property>
 	      <property name="can_focus">True</property>
-	      <property name="label" translatable="yes">S_ynchronize clock with Internet servers:</property>
+	      <property name="label" translatable="yes">Periodically s_ynchronize clock with Internet servers:</property>
 	      <property name="use_underline">True</property>
 	      <property name="relief">GTK_RELIEF_NORMAL</property>
 	      <property name="focus_on_click">True</property>
@@ -472,6 +472,106 @@
 	      <property name="y_options"></property>
 	    </packing>
 	  </child>
+
+	  <child>
+	    <widget class="GtkButton" id="synchronize_button">
+	      <property name="visible">True</property>
+	      <property name="can_focus">True</property>
+	      <property name="relief">GTK_RELIEF_NORMAL</property>
+	      <property name="focus_on_click">True</property>
+
+	      <child>
+		<widget class="GtkAlignment" id="alignment10">
+		  <property name="visible">True</property>
+		  <property name="xalign">0.5</property>
+		  <property name="yalign">0.5</property>
+		  <property name="xscale">0</property>
+		  <property name="yscale">0</property>
+		  <property name="top_padding">0</property>
+		  <property name="bottom_padding">0</property>
+		  <property name="left_padding">0</property>
+		  <property name="right_padding">0</property>
+
+		  <child>
+		    <widget class="GtkHBox" id="hbox50">
+		      <property name="visible">True</property>
+		      <property name="homogeneous">False</property>
+		      <property name="spacing">2</property>
+
+		      <child>
+			<widget class="GtkImage" id="image13">
+			  <property name="visible">True</property>
+			  <property name="stock">gnome-stock-timer</property>
+			  <property name="icon_size">4</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+
+		      <child>
+			<widget class="GtkLabel" id="label114">
+			  <property name="visible">True</property>
+			  <property name="label" translatable="yes">Synchronize _Now</property>
+			  <property name="use_underline">True</property>
+			  <property name="use_markup">False</property>
+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
+			  <property name="wrap">False</property>
+			  <property name="selectable">False</property>
+			  <property name="xalign">0.5</property>
+			  <property name="yalign">0.5</property>
+			  <property name="xpad">0</property>
+			  <property name="ypad">0</property>
+			</widget>
+			<packing>
+			  <property name="padding">0</property>
+			  <property name="expand">False</property>
+			  <property name="fill">False</property>
+			</packing>
+		      </child>
+		    </widget>
+		  </child>
+		</widget>
+	      </child>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">2</property>
+	      <property name="right_attach">3</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">5</property>
+	      <property name="x_options">fill</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
+
+	  <child>
+	    <widget class="GtkLabel" id="synchronize_label">
+	      <property name="visible">True</property>
+	      <property name="label" translatable="yes">Synchronize only once with Internet servers:</property>
+	      <property name="use_underline">False</property>
+	      <property name="use_markup">False</property>
+	      <property name="justify">GTK_JUSTIFY_LEFT</property>
+	      <property name="wrap">True</property>
+	      <property name="selectable">False</property>
+	      <property name="xalign">0</property>
+	      <property name="yalign">0.5</property>
+	      <property name="xpad">0</property>
+	      <property name="ypad">0</property>
+	    </widget>
+	    <packing>
+	      <property name="left_attach">0</property>
+	      <property name="right_attach">2</property>
+	      <property name="top_attach">4</property>
+	      <property name="bottom_attach">5</property>
+	      <property name="y_options"></property>
+	    </packing>
+	  </child>
 	</widget>
 	<packing>
 	  <property name="padding">0</property>
diff -urNad gnome-system-tools-2.14.0~/src/time/main.c gnome-system-tools-2.14.0/src/time/main.c
--- gnome-system-tools-2.14.0~/src/time/main.c	2006-04-20 18:21:17.000000000 +0200
+++ gnome-system-tools-2.14.0/src/time/main.c	2006-04-20 18:22:08.000000000 +0200
@@ -57,6 +57,7 @@
 static void on_server_list_element_toggled (GtkCellRendererToggle*, gchar*, gpointer);
 static void on_timezone_help_button_clicked (GtkWidget*, gpointer);
 static void on_time_server_help_button_clicked (GtkWidget*, gpointer);
+static void on_synchronize_button_clicked (GtkWidget*, gpointer);
 
 static char *ntp_servers[] =
 {
@@ -133,6 +134,7 @@
 	{ "ntp_add_server",          "clicked",         G_CALLBACK (gst_dialog_modify_cb) },
 	{ "time_zone_help_button",   "clicked",         G_CALLBACK (on_timezone_help_button_clicked) },
 	{ "time_server_help_button", "clicked",         G_CALLBACK (on_time_server_help_button_clicked) },
+	{ "synchronize_button",      "clicked",         G_CALLBACK (on_synchronize_button_clicked) },
 	{ NULL }
 };
 
@@ -445,6 +447,12 @@
 }
 
 static void
+on_synchronize_button_clicked (GtkWidget *w, gpointer data)
+{
+	g_spawn_command_line_async ("/etc/network/if-up.d/ntpdate", NULL);
+}
+
+static void
 ntp_use_toggled (GtkWidget *w, GstDialog *dialog)
 {
 	gboolean active, configured, ntp_installed;
@@ -489,6 +497,7 @@
 		gst_dialog_modify (dialog);
 	
 	gtk_widget_set_sensitive (gst_dialog_get_widget (dialog, "timeserver_button"), active);
+	gtk_widget_set_sensitive (gst_dialog_get_widget (dialog, "synchronize_button"), !active);
 }
 
 GST_TOOL_MAKE_TYPE(time,Time)
@@ -784,6 +793,13 @@
 	gst_time_init_timezone (GST_TIME_TOOL (tool));
 	gst_tool_main (tool, TRUE);
 
+	if (!(gboolean) g_object_get_data (G_OBJECT (tool), "ntpdate")) {
+		gtk_widget_hide (gst_dialog_get_widget (tool->main_dialog,
+							"synchronize_label"));
+		gtk_widget_hide (gst_dialog_get_widget (tool->main_dialog,
+							"synchronize_button"));
+	}
+
 	gst_time_clock_start (GST_TIME_TOOL (tool));
 	gtk_main ();
 
diff -urNad gnome-system-tools-2.14.0~/src/time/transfer.c gnome-system-tools-2.14.0/src/time/transfer.c
--- gnome-system-tools-2.14.0~/src/time/transfer.c	2005-08-08 21:00:04.000000000 +0200
+++ gnome-system-tools-2.14.0/src/time/transfer.c	2006-04-20 18:21:18.000000000 +0200
@@ -239,6 +239,9 @@
 	}
 
 	g_object_set_data (G_OBJECT (tool), "ntpinstalled", (gpointer) res);
+	node = gst_xml_element_find_first (root, "ntpinstalled");
+	g_object_set_data (G_OBJECT (tool), "ntpdate",
+			   (gpointer) (node != NULL));
 }
 
 void