change custom widget creator to e_url_entry_new

2002-02-08  JP Rosevear  <jpr@ximian.com>

	* gui/dialogs/task-details-page.glade: change custom widget
	creator to e_url_entry_new

	* gui/dialogs/task-details-page.c (get_widgets): get the url entry
	and its entry

svn path=/trunk/; revision=15622

3 files changed, 20 insertions, 41 deletions

diff --git a/calendar/ChangeLog b/calendar/ChangeLog
index d087f746bf..3885059cc3 100644
--- a/calendar/ChangeLog
+++ b/calendar/ChangeLog
@@ -1,5 +1,13 @@
 2002-02-08  JP Rosevear  <jpr@ximian.com>
 
+	* gui/dialogs/task-details-page.glade: change custom widget
+	creator to e_url_entry_new
+
+	* gui/dialogs/task-details-page.c (get_widgets): get the url entry
+	and its entry
+
+2002-02-08  JP Rosevear  <jpr@ximian.com>
+
 	* gui/dialogs/task-details-page.glade: add a custom widget created
 	with e_url_button_new
 
diff --git a/calendar/gui/dialogs/task-details-page.c b/calendar/gui/dialogs/task-details-page.c
index adc0bdaf3c..84070ff541 100644
--- a/calendar/gui/dialogs/task-details-page.c
+++ b/calendar/gui/dialogs/task-details-page.c
@@ -30,7 +30,7 @@
 #include <glade/glade.h>
 #include <gal/widgets/e-unicode.h>
 #include <widgets/misc/e-dateedit.h>
-#include <widgets/misc/e-url-button.h>
+#include <widgets/misc/e-url-entry.h>
 #include "e-util/e-dialog-widgets.h"
 #include "../calendar-config.h"
 #include "../e-timezone-entry.h"
@@ -53,8 +53,8 @@ struct _TaskDetailsPagePrivate {
 
 	GtkWidget *completed_date;
 
+	GtkWidget *url_entry;
 	GtkWidget *url;
-	GtkWidget *url_button;
 
 	gboolean updating;
 };
@@ -169,8 +169,9 @@ task_details_page_init (TaskDetailsPage *tdpage)
 	priv->percent_complete = NULL;
 	
 	priv->completed_date = NULL;
+
+	priv->url_entry = NULL;
 	priv->url = NULL;
-	priv->url_button = NULL;
 
 	priv->updating = FALSE;
 }
@@ -479,8 +480,8 @@ get_widgets (TaskDetailsPage *tdpage)
 
 	priv->completed_date = GW ("completed-date");
 
-	priv->url = GW ("url");
-	priv->url_button = GW ("url_button");
+	priv->url_entry = GW ("url_entry");
+	priv->url = e_url_entry_get_entry (E_URL_ENTRY (priv->url_entry));
 	
 #undef GW
 
@@ -672,9 +673,6 @@ init_widgets (TaskDetailsPage *tdpage)
 					   (EDateEditGetTimeCallback) comp_editor_get_current_time,
 					   tdpage, NULL);
 
-	/* Connect the url button to the url entry */
-	e_url_button_set_entry (E_URL_BUTTON (priv->url_button), priv->url);
-	
 	/* Connect signals. The Status, Percent Complete & Date Completed
 	   properties are closely related so whenever one changes we may need
 	   to update the other 2. */
diff --git a/calendar/gui/dialogs/task-details-page.glade b/calendar/gui/dialogs/task-details-page.glade
index 48ecfdfdca..28bf6a3bcc 100644
--- a/calendar/gui/dialogs/task-details-page.glade
+++ b/calendar/gui/dialogs/task-details-page.glade
@@ -281,10 +281,12 @@ Undefined
       </widget>
 
       <widget>
-	<class>GtkHBox</class>
-	<name>hbox2</name>
-	<homogeneous>False</homogeneous>
-	<spacing>0</spacing>
+	<class>Custom</class>
+	<name>url_entry</name>
+	<creation_function>e_url_entry_new</creation_function>
+	<int1>0</int1>
+	<int2>0</int2>
+	<last_modification_time>Fri, 08 Feb 2002 21:02:37 GMT</last_modification_time>
 	<child>
 	  <left_attach>1</left_attach>
 	  <right_attach>2</right_attach>
@@ -299,35 +301,6 @@ Undefined
 	  <xfill>True</xfill>
 	  <yfill>True</yfill>
 	</child>
-
-	<widget>
-	  <class>GtkEntry</class>
-	  <name>url</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>
-	  <class>Custom</class>
-	  <name>url_button</name>
-	  <creation_function>e_url_button_new</creation_function>
-	  <int1>0</int1>
-	  <int2>0</int2>
-	  <last_modification_time>Fri, 08 Feb 2002 16:56:48 GMT</last_modification_time>
-	  <child>
-	    <padding>0</padding>
-	    <expand>False</expand>
-	    <fill>False</fill>
-	  </child>
-	</widget>
       </widget>
     </widget>
   </widget>