rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

11 files changed, 0 insertions, 3502 deletions

diff --git a/packages/gkdial/gkdial-1.8.1/gkdial-arm.patch b/packages/gkdial/gkdial-1.8.1/gkdial-arm.patch
deleted file mode 100644
index aa24977762..0000000000
--- a/packages/gkdial/gkdial-1.8.1/gkdial-arm.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gkdial-1.8.1.orig/src/main.c	2003-06-27 04:47:54.000000000 +0200
-+++ gkdial-1.8.1/src/main.c	2004-06-18 12:30:11.000000000 +0200
-@@ -416,7 +416,7 @@
-   gkdial.add_only = FALSE;
-   gkdial.edit_only = FALSE;
-   gkdial.remove_only = FALSE;
--  char c;
-+  int c;
- 
-   /*
-    * it seems like poff kills gkdial together with it's children, so
diff --git a/packages/gkdial/gkdial-1.8.1/gkdial-gladedir.patch b/packages/gkdial/gkdial-1.8.1/gkdial-gladedir.patch
deleted file mode 100644
index 64b7b15b62..0000000000
--- a/packages/gkdial/gkdial-1.8.1/gkdial-gladedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2004-06-16 18:27:51.000000000 +0200
-+++ Makefile.am	2004-06-16 18:28:09.000000000 +0200
-@@ -7,7 +7,7 @@
- 	gkdial.glade \
- 	gkdial.gladep
- 
--gladedir = $(DESTDIR)/$(pkgdatadir)/glade
-+gladedir = $(pkgdatadir)/glade
- glade_DATA = gkdial.glade
- 
- install-data-local:
diff --git a/packages/gkdial/gkdial-1.8.1/gkdial-gpe-su.patch b/packages/gkdial/gkdial-1.8.1/gkdial-gpe-su.patch
deleted file mode 100644
index 0be396f389..0000000000
--- a/packages/gkdial/gkdial-1.8.1/gkdial-gpe-su.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- gkdial-1.8.1.orig/src/util.c	2003-06-27 22:30:29.000000000 +0200
-+++ gkdial-1.8.1/src/util.c	2004-06-18 16:57:43.000000000 +0200
-@@ -336,13 +336,13 @@
-   gint a;
-   pid_t pid;
-   gchar **command;
-+  gchar *fcmd = g_strdup_printf("%s > /dev/null 2>&1",cmd);
- 
--  command = g_malloc (sizeof (gchar *) * 5);
--  command[0] = g_strdup ("/usr/bin/gksu");
--  command[1] = g_strdup ("-m");
--  command[2] = g_strdup (msg);
--  command[3] = g_strdup (cmd);
--  command[4] = NULL;
-+  command = g_malloc (sizeof (gchar *) * 4);
-+  command[0] = g_strdup (PREFIX "/bin/gpe-su");
-+  command[1] = g_strdup ("-c");
-+  command[2] = fcmd;
-+  command[3] = NULL;
- 
-   pid = fork ();
-   if (pid == 0)
diff --git a/packages/gkdial/gkdial/gkdial-gladedir.patch b/packages/gkdial/gkdial/gkdial-gladedir.patch
deleted file mode 100644
index 64b7b15b62..0000000000
--- a/packages/gkdial/gkdial/gkdial-gladedir.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.am.orig	2004-06-16 18:27:51.000000000 +0200
-+++ Makefile.am	2004-06-16 18:28:09.000000000 +0200
-@@ -7,7 +7,7 @@
- 	gkdial.glade \
- 	gkdial.gladep
- 
--gladedir = $(DESTDIR)/$(pkgdatadir)/glade
-+gladedir = $(pkgdatadir)/glade
- glade_DATA = gkdial.glade
- 
- install-data-local:
diff --git a/packages/gkdial/gkdial/gkdial-gpepda.patch b/packages/gkdial/gkdial/gkdial-gpepda.patch
deleted file mode 100644
index ce3444c27b..0000000000
--- a/packages/gkdial/gkdial/gkdial-gpepda.patch
+++ /dev/null
@@ -1,1542 +0,0 @@
-diff -ru gkdial-1.8.1-psi/gkdial.glade gkdial-1.8.1/gkdial.glade
---- gkdial-1.8.1-psi/gkdial.glade	2005-01-25 17:38:01.000000000 +0100
-+++ gkdial-1.8.1/gkdial.glade	2005-01-25 17:25:07.000000000 +0100
-@@ -5,7 +5,7 @@
- 
- <widget class="GtkWindow" id="gk_main_window">
-   <property name="border_width">1</property>
--  <property name="title" translatable="yes">Internet Dialler</property>
-+  <property name="title" translatable="yes">Modem Dialler</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">False</property>
-@@ -22,7 +22,7 @@
-       <property name="border_width">2</property>
-       <property name="visible">True</property>
-       <property name="homogeneous">False</property>
--      <property name="spacing">6</property>
-+      <property name="spacing">0</property>
- 
-       <child>
- 	<widget class="GtkMenuBar" id="menubar1">
-@@ -174,7 +174,7 @@
- 	<widget class="GtkToolbar" id="toolbar1">
- 	  <property name="visible">True</property>
- 	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
--	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-+	  <property name="toolbar_style">GTK_TOOLBAR_ICONS</property>
- 	  <property name="tooltips">True</property>
- 	  <property name="show_arrow">True</property>
- 
-@@ -217,7 +217,7 @@
- 	      <property name="visible_vertical">True</property>
- 	    </widget>
- 	    <packing>
--	      <property name="expand">False</property>
-+	      <property name="expand">True</property>
- 	      <property name="homogeneous">False</property>
- 	    </packing>
- 	  </child>
-@@ -245,29 +245,15 @@
- 
-       <child>
- 	<widget class="GtkTable" id="main_table">
-+	  <property name="border_width">3</property>
- 	  <property name="visible">True</property>
--	  <property name="n_rows">5</property>
-+	  <property name="n_rows">3</property>
- 	  <property name="n_columns">5</property>
- 	  <property name="homogeneous">False</property>
--	  <property name="row_spacing">0</property>
-+	  <property name="row_spacing">3</property>
- 	  <property name="column_spacing">5</property>
- 
- 	  <child>
--	    <widget class="GtkHButtonBox" id="hbuttonbox2">
--	      <property name="visible">True</property>
--	      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
--	      <property name="spacing">0</property>
--	    </widget>
--	    <packing>
--	      <property name="left_attach">0</property>
--	      <property name="right_attach">5</property>
--	      <property name="top_attach">4</property>
--	      <property name="bottom_attach">5</property>
--	      <property name="x_options">fill</property>
--	    </packing>
--	  </child>
--
--	  <child>
- 	    <widget class="GtkImage" id="main_image">
- 	      <property name="visible">True</property>
- 	      <property name="xalign">0</property>
-@@ -288,7 +274,7 @@
- 
- 	  <child>
- 	    <widget class="GtkCombo" id="main_combo">
--	      <property name="width_request">240</property>
-+	      <property name="width_request">120</property>
- 	      <property name="visible">True</property>
- 	      <property name="can_default">True</property>
- 	      <property name="has_default">True</property>
-@@ -307,7 +293,7 @@
- 		  <property name="max_length">0</property>
- 		  <property name="text" translatable="yes"></property>
- 		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
-+		  <property name="invisible_char">*</property>
- 		  <property name="activates_default">False</property>
- 		</widget>
- 	      </child>
-@@ -364,7 +350,7 @@
- </widget>
- 
- <widget class="GtkWindow" id="details_window">
--  <property name="title" translatable="yes">Dialler: Details</property>
-+  <property name="title" translatable="yes">Details</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">False</property>
-@@ -671,10 +657,12 @@
- </widget>
- 
- <widget class="GtkWindow" id="prefs_window">
--  <property name="title" translatable="yes">Dialler: Preferences</property>
-+  <property name="title" translatable="yes">Preferences</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">True</property>
-+  <property name="default_width">240</property>
-+  <property name="default_height">320</property>
-   <property name="resizable">True</property>
-   <property name="destroy_with_parent">False</property>
-   <property name="decorated">True</property>
-@@ -691,7 +679,7 @@
- 
-       <child>
- 	<widget class="GtkNotebook" id="notebook1">
--	  <property name="border_width">6</property>
-+	  <property name="border_width">3</property>
- 	  <property name="visible">True</property>
- 	  <property name="can_focus">True</property>
- 	  <property name="show_tabs">True</property>
-@@ -764,8 +752,6 @@
- 
- 	      <child>
- 		<widget class="GtkScrolledWindow" id="scrolledwindow1">
--		  <property name="width_request">209</property>
--		  <property name="height_request">243</property>
- 		  <property name="visible">True</property>
- 		  <property name="can_focus">True</property>
- 		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-@@ -824,144 +810,162 @@
- 	      <property name="spacing">0</property>
- 
- 	      <child>
--		<widget class="GtkFrame" id="frame7">
-+		<widget class="GtkScrolledWindow" id="scrolledwindow2">
- 		  <property name="visible">True</property>
--		  <property name="label_xalign">0</property>
--		  <property name="label_yalign">0.5</property>
--		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-+		  <property name="can_focus">True</property>
-+		  <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+		  <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
-+		  <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
- 
- 		  <child>
--		    <widget class="GtkTable" id="table3">
--		      <property name="border_width">5</property>
-+		    <widget class="GtkViewport" id="viewport2">
- 		      <property name="visible">True</property>
--		      <property name="n_rows">2</property>
--		      <property name="n_columns">2</property>
--		      <property name="homogeneous">False</property>
--		      <property name="row_spacing">11</property>
--		      <property name="column_spacing">0</property>
--
--		      <child>
--			<widget class="GtkCheckButton" id="check_retry_when_dialing">
--			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">_Retry if connection quits when dialing</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="focus_on_click">True</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
--			</widget>
--			<packing>
--			  <property name="left_attach">0</property>
--			  <property name="right_attach">1</property>
--			  <property name="top_attach">0</property>
--			  <property name="bottom_attach">1</property>
--			  <property name="x_options">expand|shrink|fill</property>
--			  <property name="y_options">shrink</property>
--			</packing>
--		      </child>
-+		      <property name="shadow_type">GTK_SHADOW_NONE</property>
- 
- 		      <child>
--			<widget class="GtkCheckButton" id="check_reconn_if_lost">
-+			<widget class="GtkFrame" id="frame7">
- 			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Reconnect if connection is lost</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="focus_on_click">True</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
--			</widget>
--			<packing>
--			  <property name="left_attach">0</property>
--			  <property name="right_attach">1</property>
--			  <property name="top_attach">1</property>
--			  <property name="bottom_attach">2</property>
--			  <property name="x_options">expand|shrink|fill</property>
--			  <property name="y_options">shrink</property>
--			</packing>
--		      </child>
-+			  <property name="label_xalign">0</property>
-+			  <property name="label_yalign">0.5</property>
-+			  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
- 
--		      <child>
--			<widget class="GtkHBox" id="hbox11">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">5</property>
-+			  <child>
-+			    <widget class="GtkTable" id="table3">
-+			      <property name="border_width">5</property>
-+			      <property name="visible">True</property>
-+			      <property name="n_rows">4</property>
-+			      <property name="n_columns">2</property>
-+			      <property name="homogeneous">False</property>
-+			      <property name="row_spacing">11</property>
-+			      <property name="column_spacing">0</property>
-+
-+			      <child>
-+				<widget class="GtkCheckButton" id="check_retry_when_dialing">
-+				  <property name="visible">True</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">_Retry if connection quits when dialing</property>
-+				  <property name="use_underline">True</property>
-+				  <property name="relief">GTK_RELIEF_NORMAL</property>
-+				  <property name="focus_on_click">True</property>
-+				  <property name="active">False</property>
-+				  <property name="inconsistent">False</property>
-+				  <property name="draw_indicator">True</property>
-+				</widget>
-+				<packing>
-+				  <property name="left_attach">0</property>
-+				  <property name="right_attach">2</property>
-+				  <property name="top_attach">0</property>
-+				  <property name="bottom_attach">1</property>
-+				  <property name="x_options">expand|shrink|fill</property>
-+				  <property name="y_options">shrink</property>
-+				</packing>
-+			      </child>
-+
-+			      <child>
-+				<widget class="GtkCheckButton" id="check_reconn_if_lost">
-+				  <property name="visible">True</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">Reconnect if connection is lost</property>
-+				  <property name="use_underline">True</property>
-+				  <property name="relief">GTK_RELIEF_NORMAL</property>
-+				  <property name="focus_on_click">True</property>
-+				  <property name="active">False</property>
-+				  <property name="inconsistent">False</property>
-+				  <property name="draw_indicator">True</property>
-+				</widget>
-+				<packing>
-+				  <property name="left_attach">0</property>
-+				  <property name="right_attach">2</property>
-+				  <property name="top_attach">3</property>
-+				  <property name="bottom_attach">4</property>
-+				  <property name="x_options">expand|shrink|fill</property>
-+				  <property name="y_options">shrink</property>
-+				</packing>
-+			      </child>
-+
-+			      <child>
-+				<widget class="GtkHBox" id="hbox11">
-+				  <property name="visible">True</property>
-+				  <property name="homogeneous">False</property>
-+				  <property name="spacing">5</property>
-+
-+				  <child>
-+				    <widget class="GtkLabel" id="label24">
-+				      <property name="visible">True</property>
-+				      <property name="label" translatable="yes">Times to retry: </property>
-+				      <property name="use_underline">False</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</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="GtkSpinButton" id="spinb_times_to_retry">
-+				      <property name="visible">True</property>
-+				      <property name="tooltip" translatable="yes">The number of tries GkDial should perform. Use '0' for infinite.</property>
-+				      <property name="can_focus">True</property>
-+				      <property name="climb_rate">1</property>
-+				      <property name="digits">0</property>
-+				      <property name="numeric">False</property>
-+				      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
-+				      <property name="snap_to_ticks">False</property>
-+				      <property name="wrap">False</property>
-+				      <property name="adjustment">0 0 100 1 10 10</property>
-+				    </widget>
-+				    <packing>
-+				      <property name="padding">0</property>
-+				      <property name="expand">True</property>
-+				      <property name="fill">True</property>
-+				    </packing>
-+				  </child>
-+				</widget>
-+				<packing>
-+				  <property name="left_attach">0</property>
-+				  <property name="right_attach">1</property>
-+				  <property name="top_attach">1</property>
-+				  <property name="bottom_attach">2</property>
-+				  <property name="x_padding">10</property>
-+				  <property name="x_options">shrink|fill</property>
-+				  <property name="y_options">shrink|fill</property>
-+				</packing>
-+			      </child>
-+			    </widget>
-+			  </child>
- 
- 			  <child>
--			    <widget class="GtkLabel" id="label24">
-+			    <widget class="GtkLabel" id="nb_conn_label_dialing">
- 			      <property name="visible">True</property>
--			      <property name="label" translatable="yes">Times to retry: </property>
-+			      <property name="label" translatable="yes">Dialing</property>
- 			      <property name="use_underline">False</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</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="GtkSpinButton" id="spinb_times_to_retry">
--			      <property name="visible">True</property>
--			      <property name="tooltip" translatable="yes">The number of tries GkDial should perform. Use '0' for infinite.</property>
--			      <property name="can_focus">True</property>
--			      <property name="climb_rate">1</property>
--			      <property name="digits">0</property>
--			      <property name="numeric">False</property>
--			      <property name="update_policy">GTK_UPDATE_ALWAYS</property>
--			      <property name="snap_to_ticks">False</property>
--			      <property name="wrap">False</property>
--			      <property name="adjustment">0 0 100 1 10 10</property>
--			    </widget>
--			    <packing>
--			      <property name="padding">0</property>
--			      <property name="expand">True</property>
--			      <property name="fill">True</property>
-+			      <property name="type">label_item</property>
- 			    </packing>
- 			  </child>
- 			</widget>
--			<packing>
--			  <property name="left_attach">1</property>
--			  <property name="right_attach">2</property>
--			  <property name="top_attach">0</property>
--			  <property name="bottom_attach">1</property>
--			  <property name="x_padding">10</property>
--			  <property name="x_options">shrink|fill</property>
--			  <property name="y_options">shrink|fill</property>
--			</packing>
- 		      </child>
- 		    </widget>
- 		  </child>
--
--		  <child>
--		    <widget class="GtkLabel" id="nb_conn_label_dialing">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Dialing</property>
--		      <property name="use_underline">False</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="type">label_item</property>
--		    </packing>
--		  </child>
- 		</widget>
- 		<packing>
- 		  <property name="padding">0</property>
-@@ -971,7 +975,7 @@
- 	      </child>
- 	    </widget>
- 	    <packing>
--	      <property name="tab_expand">False</property>
-+	      <property name="tab_expand">True</property>
- 	      <property name="tab_fill">True</property>
- 	    </packing>
- 	  </child>
-@@ -996,216 +1000,234 @@
- 	  </child>
- 
- 	  <child>
--	    <widget class="GtkVBox" id="vbox6">
-+	    <widget class="GtkScrolledWindow" id="scrolledwindow3">
- 	      <property name="visible">True</property>
--	      <property name="homogeneous">False</property>
--	      <property name="spacing">0</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
- 
- 	      <child>
--		<widget class="GtkFrame" id="frame8">
-+		<widget class="GtkViewport" id="viewport3">
- 		  <property name="visible">True</property>
--		  <property name="label_xalign">0</property>
--		  <property name="label_yalign">0.5</property>
--		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
- 
- 		  <child>
--		    <widget class="GtkTable" id="table4">
--		      <property name="border_width">5</property>
-+		    <widget class="GtkVBox" id="vbox6">
- 		      <property name="visible">True</property>
--		      <property name="n_rows">2</property>
--		      <property name="n_columns">3</property>
- 		      <property name="homogeneous">False</property>
--		      <property name="row_spacing">13</property>
--		      <property name="column_spacing">0</property>
-+		      <property name="spacing">0</property>
- 
- 		      <child>
--			<widget class="GtkCheckButton" id="check_mw_starts_hiden">
-+			<widget class="GtkFrame" id="frame8">
- 			  <property name="visible">True</property>
--			  <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Main window is hidden when the program starts</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="focus_on_click">True</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
-+			  <property name="label_xalign">0</property>
-+			  <property name="label_yalign">0.5</property>
-+			  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-+
-+			  <child>
-+			    <widget class="GtkTable" id="table4">
-+			      <property name="border_width">5</property>
-+			      <property name="visible">True</property>
-+			      <property name="n_rows">2</property>
-+			      <property name="n_columns">3</property>
-+			      <property name="homogeneous">False</property>
-+			      <property name="row_spacing">7</property>
-+			      <property name="column_spacing">0</property>
-+
-+			      <child>
-+				<widget class="GtkCheckButton" id="check_mw_starts_hiden">
-+				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">Hide main window on startup</property>
-+				  <property name="use_underline">True</property>
-+				  <property name="relief">GTK_RELIEF_NORMAL</property>
-+				  <property name="focus_on_click">True</property>
-+				  <property name="active">False</property>
-+				  <property name="inconsistent">False</property>
-+				  <property name="draw_indicator">True</property>
-+				</widget>
-+				<packing>
-+				  <property name="left_attach">0</property>
-+				  <property name="right_attach">2</property>
-+				  <property name="top_attach">0</property>
-+				  <property name="bottom_attach">1</property>
-+				  <property name="y_options">expand</property>
-+				</packing>
-+			      </child>
-+
-+			      <child>
-+				<widget class="GtkCheckButton" id="check_quit_on_off">
-+				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Exit application after connection is terminated.</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">Exit Dialler when connection is closed</property>
-+				  <property name="use_underline">True</property>
-+				  <property name="relief">GTK_RELIEF_NORMAL</property>
-+				  <property name="focus_on_click">True</property>
-+				  <property name="active">False</property>
-+				  <property name="inconsistent">False</property>
-+				  <property name="draw_indicator">True</property>
-+				</widget>
-+				<packing>
-+				  <property name="left_attach">0</property>
-+				  <property name="right_attach">2</property>
-+				  <property name="top_attach">1</property>
-+				  <property name="bottom_attach">2</property>
-+				  <property name="y_options">expand</property>
-+				</packing>
-+			      </child>
-+			    </widget>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkLabel" id="label25">
-+			      <property name="visible">True</property>
-+			      <property name="label" translatable="yes">Main Window</property>
-+			      <property name="use_underline">False</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="type">label_item</property>
-+			    </packing>
-+			  </child>
- 			</widget>
- 			<packing>
--			  <property name="left_attach">0</property>
--			  <property name="right_attach">2</property>
--			  <property name="top_attach">0</property>
--			  <property name="bottom_attach">1</property>
--			  <property name="y_options">expand</property>
-+			  <property name="padding">0</property>
-+			  <property name="expand">True</property>
-+			  <property name="fill">True</property>
- 			</packing>
- 		      </child>
- 
- 		      <child>
--			<widget class="GtkCheckButton" id="check_quit_on_off">
-+			<widget class="GtkFrame" id="details_frame">
- 			  <property name="visible">True</property>
--			  <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Exit Dialler when connection is closed</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="focus_on_click">True</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
-+			  <property name="label_xalign">0</property>
-+			  <property name="label_yalign">0.5</property>
-+			  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-+
-+			  <child>
-+			    <widget class="GtkCheckButton" id="check_hide_dw_on_conn">
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="label" translatable="yes">Hide details window when connection is accomplished</property>
-+			      <property name="use_underline">True</property>
-+			      <property name="relief">GTK_RELIEF_NORMAL</property>
-+			      <property name="focus_on_click">True</property>
-+			      <property name="active">False</property>
-+			      <property name="inconsistent">False</property>
-+			      <property name="draw_indicator">True</property>
-+			    </widget>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkLabel" id="frame_details_label">
-+			      <property name="visible">True</property>
-+			      <property name="label" translatable="yes">Details Window</property>
-+			      <property name="use_underline">False</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="type">label_item</property>
-+			    </packing>
-+			  </child>
- 			</widget>
- 			<packing>
--			  <property name="left_attach">0</property>
--			  <property name="right_attach">2</property>
--			  <property name="top_attach">1</property>
--			  <property name="bottom_attach">2</property>
--			  <property name="y_options">expand</property>
-+			  <property name="padding">0</property>
-+			  <property name="expand">True</property>
-+			  <property name="fill">True</property>
- 			</packing>
- 		      </child>
--		    </widget>
--		  </child>
--
--		  <child>
--		    <widget class="GtkLabel" id="label25">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Main Window</property>
--		      <property name="use_underline">False</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="type">label_item</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">True</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkFrame" id="details_frame">
--		  <property name="visible">True</property>
--		  <property name="label_xalign">0</property>
--		  <property name="label_yalign">0.5</property>
--		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
--
--		  <child>
--		    <widget class="GtkCheckButton" id="check_hide_dw_on_conn">
--		      <property name="visible">True</property>
--		      <property name="can_focus">True</property>
--		      <property name="label" translatable="yes">Hide details window when connection is accomplished</property>
--		      <property name="use_underline">True</property>
--		      <property name="relief">GTK_RELIEF_NORMAL</property>
--		      <property name="focus_on_click">True</property>
--		      <property name="active">False</property>
--		      <property name="inconsistent">False</property>
--		      <property name="draw_indicator">True</property>
--		    </widget>
--		  </child>
--
--		  <child>
--		    <widget class="GtkLabel" id="frame_details_label">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Details Window</property>
--		      <property name="use_underline">False</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="type">label_item</property>
--		    </packing>
--		  </child>
--		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">True</property>
--		  <property name="fill">True</property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkFrame" id="frame9">
--		  <property name="visible">True</property>
--		  <property name="label_xalign">0</property>
--		  <property name="label_yalign">0.5</property>
--		  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
--
--		  <child>
--		    <widget class="GtkTable" id="table6">
--		      <property name="border_width">5</property>
--		      <property name="visible">True</property>
--		      <property name="n_rows">1</property>
--		      <property name="n_columns">3</property>
--		      <property name="homogeneous">False</property>
--		      <property name="row_spacing">14</property>
--		      <property name="column_spacing">0</property>
- 
- 		      <child>
--			<widget class="GtkCheckButton" id="check_always_tray">
-+			<widget class="GtkFrame" id="frame9">
- 			  <property name="visible">True</property>
--			  <property name="tooltip" translatable="yes">Always shows tray icon, despite the connection state</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Always show tray icon</property>
--			  <property name="use_underline">True</property>
--			  <property name="relief">GTK_RELIEF_NORMAL</property>
--			  <property name="focus_on_click">True</property>
--			  <property name="active">False</property>
--			  <property name="inconsistent">False</property>
--			  <property name="draw_indicator">True</property>
-+			  <property name="label_xalign">0</property>
-+			  <property name="label_yalign">0.5</property>
-+			  <property name="shadow_type">GTK_SHADOW_ETCHED_IN</property>
-+
-+			  <child>
-+			    <widget class="GtkTable" id="table6">
-+			      <property name="border_width">5</property>
-+			      <property name="visible">True</property>
-+			      <property name="n_rows">1</property>
-+			      <property name="n_columns">3</property>
-+			      <property name="homogeneous">False</property>
-+			      <property name="row_spacing">14</property>
-+			      <property name="column_spacing">0</property>
-+
-+			      <child>
-+				<widget class="GtkCheckButton" id="check_always_tray">
-+				  <property name="visible">True</property>
-+				  <property name="tooltip" translatable="yes">Always shows tray icon, despite the connection state</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">Always show tray icon</property>
-+				  <property name="use_underline">True</property>
-+				  <property name="relief">GTK_RELIEF_NORMAL</property>
-+				  <property name="focus_on_click">True</property>
-+				  <property name="active">False</property>
-+				  <property name="inconsistent">False</property>
-+				  <property name="draw_indicator">True</property>
-+				</widget>
-+				<packing>
-+				  <property name="left_attach">0</property>
-+				  <property name="right_attach">2</property>
-+				  <property name="top_attach">0</property>
-+				  <property name="bottom_attach">1</property>
-+				  <property name="y_options">expand</property>
-+				</packing>
-+			      </child>
-+			    </widget>
-+			  </child>
-+
-+			  <child>
-+			    <widget class="GtkLabel" id="label36">
-+			      <property name="visible">True</property>
-+			      <property name="label" translatable="yes">Tray Icon</property>
-+			      <property name="use_underline">False</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="type">label_item</property>
-+			    </packing>
-+			  </child>
- 			</widget>
- 			<packing>
--			  <property name="left_attach">0</property>
--			  <property name="right_attach">2</property>
--			  <property name="top_attach">0</property>
--			  <property name="bottom_attach">1</property>
--			  <property name="y_options">expand</property>
-+			  <property name="padding">0</property>
-+			  <property name="expand">True</property>
-+			  <property name="fill">True</property>
- 			</packing>
- 		      </child>
- 		    </widget>
- 		  </child>
--
--		  <child>
--		    <widget class="GtkLabel" id="label36">
--		      <property name="visible">True</property>
--		      <property name="label" translatable="yes">Tray Icon</property>
--		      <property name="use_underline">False</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="type">label_item</property>
--		    </packing>
--		  </child>
- 		</widget>
--		<packing>
--		  <property name="padding">0</property>
--		  <property name="expand">True</property>
--		  <property name="fill">True</property>
--		</packing>
- 	      </child>
- 	    </widget>
- 	    <packing>
--	      <property name="tab_expand">False</property>
-+	      <property name="tab_expand">True</property>
- 	      <property name="tab_fill">True</property>
- 	    </packing>
- 	  </child>
-@@ -1252,7 +1274,7 @@
- 	  <property name="visible">True</property>
- 	  <property name="xalign">1</property>
- 	  <property name="yalign">0.5</property>
--	  <property name="xscale">0.03</property>
-+	  <property name="xscale">0.03</property>
- 	  <property name="yscale">1</property>
- 	  <property name="top_padding">0</property>
- 	  <property name="bottom_padding">0</property>
-@@ -1286,6 +1308,8 @@
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">True</property>
-+  <property name="default_width">240</property>
-+  <property name="default_height">300</property>
-   <property name="resizable">True</property>
-   <property name="destroy_with_parent">False</property>
-   <property name="decorated">True</property>
-@@ -1296,14 +1320,13 @@
- 
-   <child>
-     <widget class="GtkVBox" id="vbox3">
--      <property name="border_width">2</property>
-+      <property name="border_width">3</property>
-       <property name="visible">True</property>
-       <property name="homogeneous">False</property>
--      <property name="spacing">5</property>
-+      <property name="spacing">3</property>
- 
-       <child>
- 	<widget class="GtkNotebook" id="notebook2">
--	  <property name="border_width">4</property>
- 	  <property name="visible">True</property>
- 	  <property name="can_focus">True</property>
- 	  <property name="show_tabs">True</property>
-@@ -1313,312 +1336,330 @@
- 	  <property name="enable_popup">False</property>
- 
- 	  <child>
--	    <widget class="GtkTable" id="table5">
--	      <property name="border_width">12</property>
-+	    <widget class="GtkScrolledWindow" id="scrolledwindow5">
- 	      <property name="visible">True</property>
--	      <property name="n_rows">7</property>
--	      <property name="n_columns">2</property>
--	      <property name="homogeneous">False</property>
--	      <property name="row_spacing">8</property>
--	      <property name="column_spacing">5</property>
-+	      <property name="can_focus">True</property>
-+	      <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+	      <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
-+	      <property name="shadow_type">GTK_SHADOW_NONE</property>
-+	      <property name="window_placement">GTK_CORNER_TOP_LEFT</property>
- 
- 	      <child>
--		<widget class="GtkLabel" id="label27">
-+		<widget class="GtkViewport" id="viewport1">
- 		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">Connection name:</property>
--		  <property name="use_underline">False</property>
--		  <property name="use_markup">True</property>
--		  <property name="justify">GTK_JUSTIFY_LEFT</property>
--		  <property name="wrap">False</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">1</property>
--		  <property name="top_attach">0</property>
--		  <property name="bottom_attach">1</property>
--		  <property name="x_options">fill</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
-+		  <property name="shadow_type">GTK_SHADOW_NONE</property>
- 
--	      <child>
--		<widget class="GtkEntry" id="cp_entry_conn_name">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="editable">True</property>
--		  <property name="visibility">True</property>
--		  <property name="max_length">255</property>
--		  <property name="text" translatable="yes"></property>
--		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
--		  <property name="activates_default">False</property>
--		</widget>
--		<packing>
--		  <property name="left_attach">1</property>
--		  <property name="right_attach">2</property>
--		  <property name="top_attach">0</property>
--		  <property name="bottom_attach">1</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkLabel" id="label28">
--		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">Phone number:</property>
--		  <property name="use_underline">False</property>
--		  <property name="use_markup">True</property>
--		  <property name="justify">GTK_JUSTIFY_LEFT</property>
--		  <property name="wrap">False</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">1</property>
--		  <property name="top_attach">1</property>
--		  <property name="bottom_attach">2</property>
--		  <property name="x_options">fill</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkEntry" id="cp_entry_phone">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="editable">True</property>
--		  <property name="visibility">True</property>
--		  <property name="max_length">0</property>
--		  <property name="text" translatable="yes"></property>
--		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
--		  <property name="activates_default">False</property>
--		</widget>
--		<packing>
--		  <property name="left_attach">1</property>
--		  <property name="right_attach">2</property>
--		  <property name="top_attach">1</property>
--		  <property name="bottom_attach">2</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkHSeparator" id="hseparator3">
--		  <property name="visible">True</property>
--		</widget>
--		<packing>
--		  <property name="left_attach">0</property>
--		  <property name="right_attach">2</property>
--		  <property name="top_attach">2</property>
--		  <property name="bottom_attach">3</property>
--		  <property name="x_options">fill</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
--
--	      <child>
--		<widget class="GtkLabel" id="label29">
--		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">User name:</property>
--		  <property name="use_underline">False</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</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">1</property>
--		  <property name="top_attach">3</property>
--		  <property name="bottom_attach">4</property>
--		  <property name="x_options">fill</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
-+		  <child>
-+		    <widget class="GtkTable" id="table5">
-+		      <property name="border_width">12</property>
-+		      <property name="visible">True</property>
-+		      <property name="n_rows">7</property>
-+		      <property name="n_columns">2</property>
-+		      <property name="homogeneous">False</property>
-+		      <property name="row_spacing">8</property>
-+		      <property name="column_spacing">5</property>
- 
--	      <child>
--		<widget class="GtkEntry" id="cp_entry_user">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="editable">True</property>
--		  <property name="visibility">True</property>
--		  <property name="max_length">0</property>
--		  <property name="text" translatable="yes"></property>
--		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
--		  <property name="activates_default">False</property>
--		</widget>
--		<packing>
--		  <property name="left_attach">1</property>
--		  <property name="right_attach">2</property>
--		  <property name="top_attach">3</property>
--		  <property name="bottom_attach">4</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
-+		      <child>
-+			<widget class="GtkLabel" id="label27">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Connection name:</property>
-+			  <property name="use_underline">False</property>
-+			  <property name="use_markup">True</property>
-+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			  <property name="wrap">False</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">1</property>
-+			  <property name="top_attach">0</property>
-+			  <property name="bottom_attach">1</property>
-+			  <property name="x_options">fill</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
- 
--	      <child>
--		<widget class="GtkLabel" id="label30">
--		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">Password:</property>
--		  <property name="use_underline">False</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</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">1</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="GtkEntry" id="cp_entry_conn_name">
-+			  <property name="visible">True</property>
-+			  <property name="can_focus">True</property>
-+			  <property name="editable">True</property>
-+			  <property name="visibility">True</property>
-+			  <property name="max_length">255</property>
-+			  <property name="text" translatable="yes"></property>
-+			  <property name="has_frame">True</property>
-+			  <property name="invisible_char">*</property>
-+			  <property name="activates_default">False</property>
-+			</widget>
-+			<packing>
-+			  <property name="left_attach">1</property>
-+			  <property name="right_attach">2</property>
-+			  <property name="top_attach">0</property>
-+			  <property name="bottom_attach">1</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
- 
--	      <child>
--		<widget class="GtkEntry" id="cp_entry_password">
--		  <property name="visible">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="editable">True</property>
--		  <property name="visibility">False</property>
--		  <property name="max_length">0</property>
--		  <property name="text" translatable="yes"></property>
--		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
--		  <property name="activates_default">False</property>
--		</widget>
--		<packing>
--		  <property name="left_attach">1</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>
-+		      <child>
-+			<widget class="GtkLabel" id="label28">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Phone number:</property>
-+			  <property name="use_underline">False</property>
-+			  <property name="use_markup">True</property>
-+			  <property name="justify">GTK_JUSTIFY_LEFT</property>
-+			  <property name="wrap">False</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">1</property>
-+			  <property name="top_attach">1</property>
-+			  <property name="bottom_attach">2</property>
-+			  <property name="x_options">fill</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
- 
--	      <child>
--		<widget class="GtkHSeparator" id="hseparator4">
--		  <property name="visible">True</property>
--		</widget>
--		<packing>
--		  <property name="left_attach">0</property>
--		  <property name="right_attach">2</property>
--		  <property name="top_attach">5</property>
--		  <property name="bottom_attach">6</property>
--		  <property name="x_options">fill</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
-+		      <child>
-+			<widget class="GtkEntry" id="cp_entry_phone">
-+			  <property name="visible">True</property>
-+			  <property name="can_focus">True</property>
-+			  <property name="editable">True</property>
-+			  <property name="visibility">True</property>
-+			  <property name="max_length">0</property>
-+			  <property name="text" translatable="yes"></property>
-+			  <property name="has_frame">True</property>
-+			  <property name="invisible_char">*</property>
-+			  <property name="activates_default">False</property>
-+			</widget>
-+			<packing>
-+			  <property name="left_attach">1</property>
-+			  <property name="right_attach">2</property>
-+			  <property name="top_attach">1</property>
-+			  <property name="bottom_attach">2</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
- 
--	      <child>
--		<widget class="GtkLabel" id="label31">
--		  <property name="visible">True</property>
--		  <property name="label" translatable="yes">Authentication:</property>
--		  <property name="use_underline">False</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</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">1</property>
--		  <property name="top_attach">6</property>
--		  <property name="bottom_attach">7</property>
--		  <property name="x_options">fill</property>
--		  <property name="y_options"></property>
--		</packing>
--	      </child>
-+		      <child>
-+			<widget class="GtkHSeparator" id="hseparator3">
-+			  <property name="visible">True</property>
-+			</widget>
-+			<packing>
-+			  <property name="left_attach">0</property>
-+			  <property name="right_attach">2</property>
-+			  <property name="top_attach">2</property>
-+			  <property name="bottom_attach">3</property>
-+			  <property name="x_options">fill</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
- 
--	      <child>
--		<widget class="GtkCombo" id="cp_combo_auth">
--		  <property name="visible">True</property>
--		  <property name="value_in_list">True</property>
--		  <property name="allow_empty">False</property>
--		  <property name="case_sensitive">False</property>
--		  <property name="enable_arrow_keys">False</property>
--		  <property name="enable_arrows_always">False</property>
-+		      <child>
-+			<widget class="GtkLabel" id="label29">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">User name:</property>
-+			  <property name="use_underline">False</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</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">1</property>
-+			  <property name="top_attach">3</property>
-+			  <property name="bottom_attach">4</property>
-+			  <property name="x_options">fill</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
- 
--		  <child internal-child="entry">
--		    <widget class="GtkEntry" id="cp_entry_auth">
--		      <property name="visible">True</property>
--		      <property name="can_focus">True</property>
--		      <property name="editable">False</property>
--		      <property name="visibility">True</property>
--		      <property name="max_length">0</property>
--		      <property name="text" translatable="yes"></property>
--		      <property name="has_frame">True</property>
--		      <property name="invisible_char" translatable="yes">*</property>
--		      <property name="activates_default">False</property>
--		    </widget>
--		  </child>
-+		      <child>
-+			<widget class="GtkEntry" id="cp_entry_user">
-+			  <property name="visible">True</property>
-+			  <property name="can_focus">True</property>
-+			  <property name="editable">True</property>
-+			  <property name="visibility">True</property>
-+			  <property name="max_length">0</property>
-+			  <property name="text" translatable="yes"></property>
-+			  <property name="has_frame">True</property>
-+			  <property name="invisible_char">*</property>
-+			  <property name="activates_default">False</property>
-+			</widget>
-+			<packing>
-+			  <property name="left_attach">1</property>
-+			  <property name="right_attach">2</property>
-+			  <property name="top_attach">3</property>
-+			  <property name="bottom_attach">4</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
- 
--		  <child internal-child="list">
--		    <widget class="GtkList" id="combo-list2">
--		      <property name="visible">True</property>
--		      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-+		      <child>
-+			<widget class="GtkLabel" id="label30">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Password:</property>
-+			  <property name="use_underline">False</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</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">1</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="GtkListItem" id="listitem12">
-+			<widget class="GtkEntry" id="cp_entry_password">
- 			  <property name="visible">True</property>
- 			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">PAP</property>
-+			  <property name="editable">True</property>
-+			  <property name="visibility">False</property>
-+			  <property name="max_length">0</property>
-+			  <property name="text" translatable="yes"></property>
-+			  <property name="has_frame">True</property>
-+			  <property name="invisible_char">*</property>
-+			  <property name="activates_default">False</property>
- 			</widget>
-+			<packing>
-+			  <property name="left_attach">1</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>
- 
- 		      <child>
--			<widget class="GtkListItem" id="listitem13">
-+			<widget class="GtkHSeparator" id="hseparator4">
- 			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">CHAP</property>
- 			</widget>
-+			<packing>
-+			  <property name="left_attach">0</property>
-+			  <property name="right_attach">2</property>
-+			  <property name="top_attach">5</property>
-+			  <property name="bottom_attach">6</property>
-+			  <property name="x_options">fill</property>
-+			  <property name="y_options"></property>
-+			</packing>
-+		      </child>
-+
-+		      <child>
-+			<widget class="GtkLabel" id="label31">
-+			  <property name="visible">True</property>
-+			  <property name="label" translatable="yes">Authentication:</property>
-+			  <property name="use_underline">False</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</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">1</property>
-+			  <property name="top_attach">6</property>
-+			  <property name="bottom_attach">7</property>
-+			  <property name="x_options">fill</property>
-+			  <property name="y_options"></property>
-+			</packing>
- 		      </child>
- 
- 		      <child>
--			<widget class="GtkListItem" id="listitem14">
-+			<widget class="GtkCombo" id="cp_combo_auth">
- 			  <property name="visible">True</property>
--			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">CHAT</property>
-+			  <property name="value_in_list">True</property>
-+			  <property name="allow_empty">False</property>
-+			  <property name="case_sensitive">False</property>
-+			  <property name="enable_arrow_keys">False</property>
-+			  <property name="enable_arrows_always">False</property>
-+
-+			  <child internal-child="entry">
-+			    <widget class="GtkEntry" id="cp_entry_auth">
-+			      <property name="visible">True</property>
-+			      <property name="can_focus">True</property>
-+			      <property name="editable">False</property>
-+			      <property name="visibility">True</property>
-+			      <property name="max_length">0</property>
-+			      <property name="text" translatable="yes"></property>
-+			      <property name="has_frame">True</property>
-+			      <property name="invisible_char">*</property>
-+			      <property name="activates_default">False</property>
-+			    </widget>
-+			  </child>
-+
-+			  <child internal-child="list">
-+			    <widget class="GtkList" id="combo-list2">
-+			      <property name="visible">True</property>
-+			      <property name="selection_mode">GTK_SELECTION_BROWSE</property>
-+
-+			      <child>
-+				<widget class="GtkListItem" id="listitem12">
-+				  <property name="visible">True</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">PAP</property>
-+				</widget>
-+			      </child>
-+
-+			      <child>
-+				<widget class="GtkListItem" id="listitem13">
-+				  <property name="visible">True</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">CHAP</property>
-+				</widget>
-+			      </child>
-+
-+			      <child>
-+				<widget class="GtkListItem" id="listitem14">
-+				  <property name="visible">True</property>
-+				  <property name="can_focus">True</property>
-+				  <property name="label" translatable="yes">CHAT</property>
-+				</widget>
-+			      </child>
-+			    </widget>
-+			  </child>
- 			</widget>
-+			<packing>
-+			  <property name="left_attach">1</property>
-+			  <property name="right_attach">2</property>
-+			  <property name="top_attach">6</property>
-+			  <property name="bottom_attach">7</property>
-+			  <property name="y_options"></property>
-+			</packing>
- 		      </child>
- 		    </widget>
- 		  </child>
- 		</widget>
--		<packing>
--		  <property name="left_attach">1</property>
--		  <property name="right_attach">2</property>
--		  <property name="top_attach">6</property>
--		  <property name="bottom_attach">7</property>
--		  <property name="y_options"></property>
--		</packing>
- 	      </child>
- 	    </widget>
- 	    <packing>
--	      <property name="tab_expand">False</property>
-+	      <property name="tab_expand">True</property>
- 	      <property name="tab_fill">True</property>
- 	    </packing>
- 	  </child>
-@@ -1685,7 +1726,7 @@
- 		  <property name="max_length">220</property>
- 		  <property name="text" translatable="yes"></property>
- 		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
-+		  <property name="invisible_char">*</property>
- 		  <property name="activates_default">False</property>
- 		</widget>
- 		<packing>
-@@ -1730,7 +1771,7 @@
- 		  <property name="max_length">220</property>
- 		  <property name="text" translatable="yes"></property>
- 		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
-+		  <property name="invisible_char">*</property>
- 		  <property name="activates_default">False</property>
- 		</widget>
- 		<packing>
-@@ -1775,7 +1816,7 @@
- 		  <property name="max_length">220</property>
- 		  <property name="text" translatable="yes"></property>
- 		  <property name="has_frame">True</property>
--		  <property name="invisible_char" translatable="yes">*</property>
-+		  <property name="invisible_char">*</property>
- 		  <property name="activates_default">False</property>
- 		</widget>
- 		<packing>
-@@ -1788,7 +1829,7 @@
- 	      </child>
- 	    </widget>
- 	    <packing>
--	      <property name="tab_expand">False</property>
-+	      <property name="tab_expand">True</property>
- 	      <property name="tab_fill">True</property>
- 	    </packing>
- 	  </child>
-@@ -1836,7 +1877,7 @@
- 	  <property name="visible">True</property>
- 	  <property name="xalign">1</property>
- 	  <property name="yalign">0.5</property>
--	  <property name="xscale">0.03</property>
-+	  <property name="xscale">0.0299999993294</property>
- 	  <property name="yscale">1</property>
- 	  <property name="top_padding">0</property>
- 	  <property name="bottom_padding">0</property>
-diff -ru gkdial-1.8.1-psi/src/tray.c gkdial-1.8.1/src/tray.c
---- gkdial-1.8.1-psi/src/tray.c	2004-10-29 11:40:00.000000000 +0200
-+++ gkdial-1.8.1/src/tray.c	2005-01-25 16:52:42.000000000 +0100
-@@ -137,6 +137,5 @@
- 
-   gkdial->tray_icon = gtk_image_new_from_pixbuf (gkdial->pixbuf_ppp_off);
-   gtk_container_add (GTK_CONTAINER (box), gkdial->tray_icon);
--tray_menu_init (gkdial);
--  //gnome_popup_menu_attach (tray_menu_init (gkdial), box, NULL);
-+  tray_menu_init (gkdial);
- }
---- /tmp/main.c	2005-01-25 17:54:28.000000000 +0100
-+++ gkdial-1.8.1/src/main.c	2005-01-25 17:56:26.000000000 +0100
-@@ -37,15 +37,15 @@
- gkdial_show_about (GtkWidget * widget, gpointer data)
- {
-   gchar *translator_credits = 
--	g_strdup (_("Adapted to GPE by Florian Boor <florian@kernelconcepts.de>"));
-+	g_strdup (_("GPE port by Florian Boor <florian@kernelconcepts.de>"));
- 
-   gk_dialog (GTK_MESSAGE_INFO,
--	     _("Internet Dialler (GkDial) %s\n\n"
--	       "A PPP setup and dialing tool for GNOME.\n\n"
--	       "Author:\n\n"
--	       "\tGustavo Noronha Silva <kov@debian.org>\n\n"
--	       "Thanks to:\n\n"
--	       "\tLeandro A. F. Pereira <leandro@linuxmag.com.br>\n\n"
-+	     _("Modem Dialler (GkDial) %s\n\n"
-+	       "A PPP setup and dialing tool.\n\n"
-+	       "Author:\n"
-+	       "Gustavo Noronha Silva <kov@debian.org>\n\n"
-+	       "Thanks to:\n"
-+	       "Leandro A. F. Pereira <leandro@linuxmag.com.br>\n\n"
- 	       "%s"), PACKAGE_VERSION, translator_credits);
- 
-   g_free (translator_credits);
diff --git a/packages/gkdial/gkdial/gkdial-pgpe.patch b/packages/gkdial/gkdial/gkdial-pgpe.patch
deleted file mode 100644
index df2f428797..0000000000
--- a/packages/gkdial/gkdial/gkdial-pgpe.patch
+++ /dev/null
@@ -1,1819 +0,0 @@
-diff -Nur gkdial-1.8.1.orig/gkdial.glade gkdial-1.8.1/gkdial.glade
---- gkdial-1.8.1.orig/gkdial.glade	2003-06-27 04:33:12.000000000 +0200
-+++ gkdial-1.8.1/gkdial.glade	2004-10-14 18:57:18.000000000 +0200
-@@ -2,16 +2,20 @@
- <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
- 
- <glade-interface>
--<requires lib="gnome"/>
- 
--<widget class="GtkWindow" id="main_window">
-+<widget class="GtkWindow" id="gk_main_window">
-   <property name="border_width">1</property>
--  <property name="title" translatable="yes">GkDial</property>
-+  <property name="title" translatable="yes">Internet Dialler</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">False</property>
-   <property name="resizable">False</property>
-   <property name="destroy_with_parent">False</property>
-+  <property name="decorated">True</property>
-+  <property name="skip_taskbar_hint">False</property>
-+  <property name="skip_pager_hint">False</property>
-+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
-+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- 
-   <child>
-     <widget class="GtkVBox" id="vbox4">
-@@ -27,7 +31,7 @@
- 	  <child>
- 	    <widget class="GtkMenuItem" id="connection1">
- 	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">_Connection</property>
-+	      <property name="label" translatable="yes">Connec_tion</property>
- 	      <property name="use_underline">True</property>
- 
- 	      <child>
-@@ -40,7 +44,7 @@
- 		      <property name="use_underline">True</property>
- 
- 		      <child internal-child="image">
--			<widget class="GtkImage" id="image9">
-+			<widget class="GtkImage" id="image18">
- 			  <property name="visible">True</property>
- 			  <property name="stock">gtk-add</property>
- 			  <property name="icon_size">1</property>
-@@ -56,13 +60,26 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="menu_properties">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_PROPERTIES_ITEM</property>
-+		      <property name="label" translatable="yes">_Properties</property>
-+		      <property name="use_underline">True</property>
- 		      <signal name="activate" handler="on_properties1_activate" last_modification_time="Thu, 29 May 2003 18:20:35 GMT"/>
-+
-+		      <child internal-child="image">
-+			<widget class="GtkImage" id="image19">
-+			  <property name="visible">True</property>
-+			  <property name="stock">gtk-preferences</property>
-+			  <property name="icon_size">1</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			</widget>
-+		      </child>
- 		    </widget>
- 		  </child>
- 
- 		  <child>
--		    <widget class="GtkMenuItem" id="separator1">
-+		    <widget class="GtkSeparatorMenuItem" id="separator1">
- 		      <property name="visible">True</property>
- 		    </widget>
- 		  </child>
-@@ -70,7 +87,20 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="menu_quit">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
-+		      <property name="label" translatable="yes">_Quit</property>
-+		      <property name="use_underline">True</property>
-+
-+		      <child internal-child="image">
-+			<widget class="GtkImage" id="image20">
-+			  <property name="visible">True</property>
-+			  <property name="stock">gtk-quit</property>
-+			  <property name="icon_size">1</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			</widget>
-+		      </child>
- 		    </widget>
- 		  </child>
- 		</widget>
-@@ -81,7 +111,8 @@
- 	  <child>
- 	    <widget class="GtkMenuItem" id="edit1">
- 	      <property name="visible">True</property>
--	      <property name="stock_item">GNOMEUIINFO_MENU_SETTINGS_TREE</property>
-+	      <property name="label" translatable="yes">_Settings</property>
-+	      <property name="use_underline">True</property>
- 
- 	      <child>
- 		<widget class="GtkMenu" id="edit1_menu">
-@@ -89,8 +120,21 @@
- 		  <child>
- 		    <widget class="GtkImageMenuItem" id="menu_preferences">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
-+		      <property name="label" translatable="yes">Prefere_nces</property>
-+		      <property name="use_underline">True</property>
- 		      <signal name="activate" handler="on_preferences1_activate" last_modification_time="Thu, 29 May 2003 18:20:35 GMT"/>
-+
-+		      <child internal-child="image">
-+			<widget class="GtkImage" id="image21">
-+			  <property name="visible">True</property>
-+			  <property name="stock">gtk-preferences</property>
-+			  <property name="icon_size">1</property>
-+			  <property name="xalign">0.5</property>
-+			  <property name="yalign">0.5</property>
-+			  <property name="xpad">0</property>
-+			  <property name="ypad">0</property>
-+			</widget>
-+		      </child>
- 		    </widget>
- 		  </child>
- 		</widget>
-@@ -101,15 +145,17 @@
- 	  <child>
- 	    <widget class="GtkMenuItem" id="help1">
- 	      <property name="visible">True</property>
--	      <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
-+	      <property name="label" translatable="yes">_Help</property>
-+	      <property name="use_underline">True</property>
- 
- 	      <child>
- 		<widget class="GtkMenu" id="help1_menu">
- 
- 		  <child>
--		    <widget class="GtkImageMenuItem" id="menu_about">
-+		    <widget class="GtkMenuItem" id="menu_about">
- 		      <property name="visible">True</property>
--		      <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
-+		      <property name="label" translatable="yes">A_bout</property>
-+		      <property name="use_underline">True</property>
- 		    </widget>
- 		  </child>
- 		</widget>
-@@ -125,6 +171,79 @@
-       </child>
- 
-       <child>
-+	<widget class="GtkToolbar" id="toolbar1">
-+	  <property name="visible">True</property>
-+	  <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
-+	  <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
-+	  <property name="tooltips">True</property>
-+	  <property name="show_arrow">True</property>
-+
-+	  <child>
-+	    <widget class="GtkToolButton" id="button_connect">
-+	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">_Connect</property>
-+	      <property name="use_underline">True</property>
-+	      <property name="stock_id">gtk-yes</property>
-+	      <property name="visible_horizontal">True</property>
-+	      <property name="visible_vertical">True</property>
-+	      <property name="is_important">True</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="expand">False</property>
-+	      <property name="homogeneous">True</property>
-+	    </packing>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkToolButton" id="button_preferences">
-+	      <property name="visible">True</property>
-+	      <property name="stock_id">gtk-preferences</property>
-+	      <property name="visible_horizontal">True</property>
-+	      <property name="visible_vertical">True</property>
-+	      <property name="is_important">False</property>
-+	      <signal name="clicked" handler="on_preferences1_activate" last_modification_time="Thu, 14 Oct 2004 16:43:57 GMT"/>
-+	    </widget>
-+	    <packing>
-+	      <property name="expand">False</property>
-+	      <property name="homogeneous">True</property>
-+	    </packing>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
-+	      <property name="visible">True</property>
-+	      <property name="draw">True</property>
-+	      <property name="visible_horizontal">True</property>
-+	      <property name="visible_vertical">True</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="expand">False</property>
-+	      <property name="homogeneous">False</property>
-+	    </packing>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkToolButton" id="button_quit">
-+	      <property name="visible">True</property>
-+	      <property name="stock_id">gtk-quit</property>
-+	      <property name="visible_horizontal">True</property>
-+	      <property name="visible_vertical">True</property>
-+	      <property name="is_important">False</property>
-+	    </widget>
-+	    <packing>
-+	      <property name="expand">False</property>
-+	      <property name="homogeneous">True</property>
-+	    </packing>
-+	  </child>
-+	</widget>
-+	<packing>
-+	  <property name="padding">0</property>
-+	  <property name="expand">False</property>
-+	  <property name="fill">False</property>
-+	</packing>
-+      </child>
-+
-+      <child>
- 	<widget class="GtkTable" id="main_table">
- 	  <property name="visible">True</property>
- 	  <property name="n_rows">5</property>
-@@ -138,84 +257,6 @@
- 	      <property name="visible">True</property>
- 	      <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
- 	      <property name="spacing">0</property>
--
--	      <child>
--		<widget class="GtkButton" id="button2">
--		  <property name="visible">True</property>
--		  <property name="can_default">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="label">gtk-help</property>
--		  <property name="use_stock">True</property>
--		  <property name="relief">GTK_RELIEF_NORMAL</property>
--		</widget>
--	      </child>
--
--	      <child>
--		<widget class="GtkButton" id="button_connect">
--		  <property name="visible">True</property>
--		  <property name="can_default">True</property>
--		  <property name="has_default">True</property>
--		  <property name="can_focus">True</property>
--		  <property name="has_focus">True</property>
--		  <property name="relief">GTK_RELIEF_NORMAL</property>
--
--		  <child>
--		    <widget class="GtkAlignment" id="alignment12">
--		      <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>
--
--		      <child>
--			<widget class="GtkHBox" id="hbox13">
--			  <property name="visible">True</property>
--			  <property name="homogeneous">False</property>
--			  <property name="spacing">0</property>
--
--			  <child>
--			    <widget class="GtkImage" id="image8">
--			      <property name="visible">True</property>
--			      <property name="stock">gtk-yes</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="label33">
--			      <property name="visible">True</property>
--			      <property name="label" translatable="yes">_Connect!</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>
--	      </child>
- 	    </widget>
- 	    <packing>
- 	      <property name="left_attach">0</property>
-@@ -246,23 +287,11 @@
- 	  </child>
- 
- 	  <child>
--	    <widget class="GtkHSeparator" id="hseparator5">
--	      <property name="visible">True</property>
--	    </widget>
--	    <packing>
--	      <property name="left_attach">0</property>
--	      <property name="right_attach">5</property>
--	      <property name="top_attach">2</property>
--	      <property name="bottom_attach">4</property>
--	      <property name="y_padding">3</property>
--	      <property name="x_options">fill</property>
--	    </packing>
--	  </child>
--
--	  <child>
- 	    <widget class="GtkCombo" id="main_combo">
- 	      <property name="width_request">240</property>
- 	      <property name="visible">True</property>
-+	      <property name="can_default">True</property>
-+	      <property name="has_default">True</property>
- 	      <property name="value_in_list">True</property>
- 	      <property name="allow_empty">True</property>
- 	      <property name="case_sensitive">False</property>
-@@ -335,12 +364,17 @@
- </widget>
- 
- <widget class="GtkWindow" id="details_window">
--  <property name="title" translatable="yes">GkDial: Details</property>
-+  <property name="title" translatable="yes">Dialler: Details</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">False</property>
-   <property name="resizable">False</property>
-   <property name="destroy_with_parent">False</property>
-+  <property name="decorated">True</property>
-+  <property name="skip_taskbar_hint">False</property>
-+  <property name="skip_pager_hint">False</property>
-+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- 
-   <child>
-     <widget class="GtkVBox" id="vbox7">
-@@ -525,6 +559,7 @@
- 	      <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">
-@@ -533,6 +568,10 @@
- 		  <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="hbox12">
-@@ -632,12 +671,17 @@
- </widget>
- 
- <widget class="GtkWindow" id="prefs_window">
--  <property name="title" translatable="yes">GkDial: Preferences</property>
-+  <property name="title" translatable="yes">Dialler: Preferences</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">True</property>
-   <property name="resizable">True</property>
-   <property name="destroy_with_parent">False</property>
-+  <property name="decorated">True</property>
-+  <property name="skip_taskbar_hint">False</property>
-+  <property name="skip_pager_hint">False</property>
-+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- 
-   <child>
-     <widget class="GtkVBox" id="vbox1">
-@@ -680,6 +724,7 @@
- 		      <property name="label">gtk-add</property>
- 		      <property name="use_stock">True</property>
- 		      <property name="relief">GTK_RELIEF_NORMAL</property>
-+		      <property name="focus_on_click">True</property>
- 		    </widget>
- 		  </child>
- 
-@@ -691,6 +736,7 @@
- 		      <property name="label">gtk-properties</property>
- 		      <property name="use_stock">True</property>
- 		      <property name="relief">GTK_RELIEF_NORMAL</property>
-+		      <property name="focus_on_click">True</property>
- 		    </widget>
- 		  </child>
- 
-@@ -702,6 +748,7 @@
- 		      <property name="label">gtk-remove</property>
- 		      <property name="use_stock">True</property>
- 		      <property name="relief">GTK_RELIEF_NORMAL</property>
-+		      <property name="focus_on_click">True</property>
- 		    </widget>
- 		  </child>
- 		</widget>
-@@ -754,7 +801,7 @@
- 	  <child>
- 	    <widget class="GtkLabel" id="nb_accounts_page">
- 	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">A_ccounts</property>
-+	      <property name="label" translatable="yes">Acco_unts</property>
- 	      <property name="use_underline">True</property>
- 	      <property name="use_markup">False</property>
- 	      <property name="justify">GTK_JUSTIFY_LEFT</property>
-@@ -800,6 +847,7 @@
- 			  <property name="label" translatable="yes">_Retry if connection quits when dialing</property>
- 			  <property name="use_underline">True</property>
- 			  <property name="relief">GTK_RELIEF_NORMAL</property>
-+			  <property name="focus_on_click">True</property>
- 			  <property name="active">False</property>
- 			  <property name="inconsistent">False</property>
- 			  <property name="draw_indicator">True</property>
-@@ -821,6 +869,7 @@
- 			  <property name="label" translatable="yes">Reconnect if connection is lost</property>
- 			  <property name="use_underline">True</property>
- 			  <property name="relief">GTK_RELIEF_NORMAL</property>
-+			  <property name="focus_on_click">True</property>
- 			  <property name="active">False</property>
- 			  <property name="inconsistent">False</property>
- 			  <property name="draw_indicator">True</property>
-@@ -977,6 +1026,7 @@
- 			  <property name="label" translatable="yes">Main window is hidden when the program starts</property>
- 			  <property name="use_underline">True</property>
- 			  <property name="relief">GTK_RELIEF_NORMAL</property>
-+			  <property name="focus_on_click">True</property>
- 			  <property name="active">False</property>
- 			  <property name="inconsistent">False</property>
- 			  <property name="draw_indicator">True</property>
-@@ -995,9 +1045,10 @@
- 			  <property name="visible">True</property>
- 			  <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
- 			  <property name="can_focus">True</property>
--			  <property name="label" translatable="yes">Exit GkDial when connection is closed</property>
-+			  <property name="label" translatable="yes">Exit Dialler when connection is closed</property>
- 			  <property name="use_underline">True</property>
- 			  <property name="relief">GTK_RELIEF_NORMAL</property>
-+			  <property name="focus_on_click">True</property>
- 			  <property name="active">False</property>
- 			  <property name="inconsistent">False</property>
- 			  <property name="draw_indicator">True</property>
-@@ -1053,6 +1104,7 @@
- 		      <property name="label" translatable="yes">Hide details window when connection is accomplished</property>
- 		      <property name="use_underline">True</property>
- 		      <property name="relief">GTK_RELIEF_NORMAL</property>
-+		      <property name="focus_on_click">True</property>
- 		      <property name="active">False</property>
- 		      <property name="inconsistent">False</property>
- 		      <property name="draw_indicator">True</property>
-@@ -1110,6 +1162,7 @@
- 			  <property name="label" translatable="yes">Always show tray icon</property>
- 			  <property name="use_underline">True</property>
- 			  <property name="relief">GTK_RELIEF_NORMAL</property>
-+			  <property name="focus_on_click">True</property>
- 			  <property name="active">False</property>
- 			  <property name="inconsistent">False</property>
- 			  <property name="draw_indicator">True</property>
-@@ -1160,8 +1213,8 @@
- 	  <child>
- 	    <widget class="GtkLabel" id="nb_interface_page">
- 	      <property name="visible">True</property>
--	      <property name="label" translatable="yes">Interface</property>
--	      <property name="use_underline">False</property>
-+	      <property name="label" translatable="yes">_Interface</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>
-@@ -1201,6 +1254,10 @@
- 	  <property name="yalign">0.5</property>
- 	  <property name="xscale">0.03</property>
- 	  <property name="yscale">1</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="GtkButton" id="button_prefs_close">
-@@ -1210,6 +1267,7 @@
- 	      <property name="label">gtk-close</property>
- 	      <property name="use_stock">True</property>
- 	      <property name="relief">GTK_RELIEF_NORMAL</property>
-+	      <property name="focus_on_click">True</property>
- 	    </widget>
- 	  </child>
- 	</widget>
-@@ -1224,12 +1282,17 @@
- </widget>
- 
- <widget class="GtkWindow" id="connedit_window">
--  <property name="title" translatable="yes">Conection Properties</property>
-+  <property name="title" translatable="yes">Connection Properties</property>
-   <property name="type">GTK_WINDOW_TOPLEVEL</property>
-   <property name="window_position">GTK_WIN_POS_CENTER</property>
-   <property name="modal">True</property>
-   <property name="resizable">True</property>
-   <property name="destroy_with_parent">False</property>
-+  <property name="decorated">True</property>
-+  <property name="skip_taskbar_hint">False</property>
-+  <property name="skip_pager_hint">False</property>
-+  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
-+  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
- 
-   <child>
-     <widget class="GtkVBox" id="vbox3">
-@@ -1578,6 +1641,176 @@
- 	      <property name="type">tab</property>
- 	    </packing>
- 	  </child>
-+
-+	  <child>
-+	    <widget class="GtkTable" id="table7">
-+	      <property name="border_width">12</property>
-+	      <property name="visible">True</property>
-+	      <property name="n_rows">3</property>
-+	      <property name="n_columns">2</property>
-+	      <property name="homogeneous">False</property>
-+	      <property name="row_spacing">8</property>
-+	      <property name="column_spacing">5</property>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label38">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">Modem init string:</property>
-+		  <property name="use_underline">False</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</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">1</property>
-+		  <property name="top_attach">0</property>
-+		  <property name="bottom_attach">1</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="cp_entry_modeminit">
-+		  <property name="visible">True</property>
-+		  <property name="can_focus">True</property>
-+		  <property name="editable">True</property>
-+		  <property name="visibility">True</property>
-+		  <property name="max_length">220</property>
-+		  <property name="text" translatable="yes"></property>
-+		  <property name="has_frame">True</property>
-+		  <property name="invisible_char" translatable="yes">*</property>
-+		  <property name="activates_default">False</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">1</property>
-+		  <property name="right_attach">2</property>
-+		  <property name="top_attach">0</property>
-+		  <property name="bottom_attach">1</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label39">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">Additional options:</property>
-+		  <property name="use_underline">False</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</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">1</property>
-+		  <property name="top_attach">1</property>
-+		  <property name="bottom_attach">2</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="cp_entry_option1">
-+		  <property name="visible">True</property>
-+		  <property name="can_focus">True</property>
-+		  <property name="editable">True</property>
-+		  <property name="visibility">True</property>
-+		  <property name="max_length">220</property>
-+		  <property name="text" translatable="yes"></property>
-+		  <property name="has_frame">True</property>
-+		  <property name="invisible_char" translatable="yes">*</property>
-+		  <property name="activates_default">False</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">1</property>
-+		  <property name="right_attach">2</property>
-+		  <property name="top_attach">1</property>
-+		  <property name="bottom_attach">2</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkLabel" id="label40">
-+		  <property name="visible">True</property>
-+		  <property name="label" translatable="yes">Additional options (cont.):</property>
-+		  <property name="use_underline">False</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</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">1</property>
-+		  <property name="top_attach">2</property>
-+		  <property name="bottom_attach">3</property>
-+		  <property name="x_options">fill</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+
-+	      <child>
-+		<widget class="GtkEntry" id="cp_entry_option2">
-+		  <property name="visible">True</property>
-+		  <property name="can_focus">True</property>
-+		  <property name="editable">True</property>
-+		  <property name="visibility">True</property>
-+		  <property name="max_length">220</property>
-+		  <property name="text" translatable="yes"></property>
-+		  <property name="has_frame">True</property>
-+		  <property name="invisible_char" translatable="yes">*</property>
-+		  <property name="activates_default">False</property>
-+		</widget>
-+		<packing>
-+		  <property name="left_attach">1</property>
-+		  <property name="right_attach">2</property>
-+		  <property name="top_attach">2</property>
-+		  <property name="bottom_attach">3</property>
-+		  <property name="y_options"></property>
-+		</packing>
-+	      </child>
-+	    </widget>
-+	    <packing>
-+	      <property name="tab_expand">False</property>
-+	      <property name="tab_fill">True</property>
-+	    </packing>
-+	  </child>
-+
-+	  <child>
-+	    <widget class="GtkLabel" id="label37">
-+	      <property name="visible">True</property>
-+	      <property name="label" translatable="yes">Ad_vanced</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="type">tab</property>
-+	    </packing>
-+	  </child>
- 	</widget>
- 	<packing>
- 	  <property name="padding">0</property>
-@@ -1605,6 +1838,10 @@
- 	  <property name="yalign">0.5</property>
- 	  <property name="xscale">0.03</property>
- 	  <property name="yscale">1</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="GtkHButtonBox" id="hbuttonbox1">
-@@ -1620,6 +1857,7 @@
- 		  <property name="label">gtk-cancel</property>
- 		  <property name="use_stock">True</property>
- 		  <property name="relief">GTK_RELIEF_NORMAL</property>
-+		  <property name="focus_on_click">True</property>
- 		</widget>
- 	      </child>
- 
-@@ -1631,6 +1869,7 @@
- 		  <property name="label">gtk-save</property>
- 		  <property name="use_stock">True</property>
- 		  <property name="relief">GTK_RELIEF_NORMAL</property>
-+		  <property name="focus_on_click">True</property>
- 		</widget>
- 	      </child>
- 	    </widget>
-diff -Nur gkdial-1.8.1.orig/gkdial.schemas gkdial-1.8.1/gkdial.schemas
---- gkdial-1.8.1.orig/gkdial.schemas	1970-01-01 01:00:00.000000000 +0100
-+++ gkdial-1.8.1/gkdial.schemas	2004-09-08 14:47:48.000000000 +0200
-@@ -0,0 +1,30 @@
-+<gconfschemafile>
-+    <schemalist>    
-+
-+      <schema>
-+        <key>/schemas/apps/gkdial/preferences/hide_dw_on_conn</key>
-+        <applyto>/apps/gkdial/preferences/hide_dw_on_conn</applyto>
-+        <owner>gkdial</owner>
-+        <type>bool</type>
-+        <default>true</default>
-+        <locale name="C">
-+          <short>Behaviour of detail window.</short>
-+          <long>Hide the detail window after a connection is established.</long>
-+        </locale>
-+      </schema>
-+
-+      <schema>
-+        <key>/schemas/apps/gkdial/preferences/always_tray</key>
-+        <applyto>/apps/gkdial/preferences/always_tray</applyto>
-+        <owner>gkdial</owner>
-+        <type>bool</type>
-+        <default>true</default>
-+        <locale name="C">
-+          <short>Behaviour of tray icon.</short>
-+          <long>Show tray icon only if necessary or always.</long>
-+        </locale>
-+      </schema>
-+      
-+    </schemalist>
-+  
-+</gconfschemafile>
-diff -Nur gkdial-1.8.1.orig/src/connedit.c gkdial-1.8.1/src/connedit.c
---- gkdial-1.8.1.orig/src/connedit.c	2003-06-27 01:14:51.000000000 +0200
-+++ gkdial-1.8.1/src/connedit.c	2004-10-16 11:30:29.000000000 +0200
-@@ -1,7 +1,9 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
--
-+#include <sys/types.h>
-+#include <sys/stat.h>
-+ 
- #ifdef HAVE_CONFIG_H
- #  include <config.h>
- #endif
-@@ -41,26 +43,45 @@
-   file_name = g_strdup_printf ("/etc/ppp/peers/%s", connection->name);
-   file = fopen (file_name, "r");
-   g_free (file_name);
--
--  while (!feof (file))
-+  
-+  if (file)
-     {
--      fgets (buf, 255, file);
--
--      /*
--       * gets the user name 
--       */
--      if (!strncmp ("user ", buf, 5))
--	{
--	  gchar *tmp;
--
--	  g_strstrip (buf);
--	  tmp = strstr (buf, " ");
--	  gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_user), tmp + 1);
--	}
-+      gint parseoptions = 0;
-+      while (!feof (file))
-+        {
-+          fgets (buf, 255, file);
-+    
-+          /*
-+           * gets the user name 
-+           */
-+          if (!strncmp ("user ", buf, 5))
-+            {
-+              gchar *tmp;
-+              
-+              g_strstrip (buf);
-+              tmp = strstr (buf, " ");
-+              gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_user), tmp + 1);
-+            }
-+          
-+          if (parseoptions)
-+            {
-+              g_strstrip (buf);
-+              if (parseoptions == 1)
-+                gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_option1), buf);
-+              if (parseoptions == 2)
-+                gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_option2), buf);
-+              parseoptions++;
-+            }
-+          
-+          if (!strncmp ("remotename ", buf, 11))
-+            {
-+              memset(buf, 0, 255);
-+              parseoptions++;
-+            }
-+        }
-+    
-+      fclose (file);
-     }
--
--  fclose (file);
--
- #ifdef DEBUG
-   fprintf (stderr, "Reading /etc/chatscripts/%s\n", connection->name);
- #endif
-@@ -72,31 +93,46 @@
-   file_name = g_strdup_printf ("/etc/chatscripts/%s", connection->name);
-   file = fopen (file_name, "r");
-   g_free (file_name);
--
--  while (!feof (file))
-+  if (file)
-     {
--      fgets (buf, 255, file);
--
--      if (!strncmp ("# ispauth", buf, 9))
--	{			/* gets the auth style */
--	  g_strstrip (buf);
--	  tmp = strstr (buf, "auth");
--	  gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_auth), tmp + 5);
--	  tmp = NULL;
--	}
--      else if (!strncmp ("# ispnumber", buf, 11))
--	{			/* gets the phone
--				 * number */
--	  fgets (buf, 255, file);
--	  g_strstrip (buf);
--	  tmp = strstr (buf, "ATD");
--	  gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_phone), tmp + 4);
--	  tmp = NULL;
--	}
-+      while (!feof (file))
-+        {
-+          fgets (buf, 255, file);
-+    
-+          if (!strncmp ("# ispauth", buf, 9))
-+        {			/* gets the auth style */
-+          g_strstrip (buf);
-+          tmp = strstr (buf, "auth");
-+          gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_auth), tmp + 5);
-+          tmp = NULL;
-+        }
-+          else if (!strncmp ("# modeminit", buf, 11))
-+        {			/* gets the modem init string */
-+          fgets (buf, 255, file);
-+          g_strstrip (buf);
-+          tmp = strstr (buf, "''");
-+          if (!strstr(tmp + 2,"'ATZ'")) /* get value, remove "'" */
-+          {
-+            gchar *t = strstr(tmp + 4, "'");
-+            if (t) 
-+                t[0] = 0;
-+            gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_modeminit), tmp + 4);
-+          }
-+          tmp = NULL;
-+        }
-+          else if (!strncmp ("# ispnumber", buf, 11))
-+        {			/* gets the phone
-+                     * number */
-+          fgets (buf, 255, file);
-+          g_strstrip (buf);
-+          tmp = strstr (buf, "ATD");
-+          gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_phone), tmp + 4);
-+          tmp = NULL;
-+        }
-+        }
-+    
-+      fclose (file);
-     }
--
--  fclose (file);
--
-   /*
-    * parses /etc/ppp/${auth_type}-secrets, to get password 
-    */
-@@ -105,9 +141,8 @@
- 
-     if (!connection->auth_type)
-       {
--	connection->auth_type =
--	  gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_auth),
--				  0, -1);
-+        connection->auth_type =
-+        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_auth), 0, -1);
-       }
- 
-     if (!strcmp (connection->auth_type, "PAP"))
-@@ -124,7 +159,7 @@
- #endif
-   file = fopen (file_name, "r");
-   g_free (file_name);
--
-+  if (file)
-   {
-     gchar *search_for;
- 
-@@ -169,8 +204,8 @@
- 	    break;
- 	  }
-       }
-+    fclose (file);
-   }
--  fclose (file);
-   g_free (buf);
- 
-   return TRUE;
-@@ -189,6 +224,12 @@
-   connection->password = NULL;
-   g_free (connection->auth_type);
-   connection->auth_type = NULL;
-+  g_free (connection->modeminit);
-+  connection->modeminit = NULL;
-+  g_free (connection->option1);
-+  connection->option1 = NULL;
-+  g_free (connection->option2);
-+  connection->option2 = NULL;
- }
- 
- void
-@@ -201,6 +242,9 @@
-   destination->user = g_strdup (source->user);
-   destination->password = g_strdup (source->password);
-   destination->auth_type = g_strdup (source->auth_type);
-+  destination->modeminit = g_strdup (source->modeminit);
-+  destination->option1 = g_strdup (source->option1);
-+  destination->option2 = g_strdup (source->option2);
- }
- 
- void
-@@ -212,6 +256,7 @@
-   gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_phone), "");
-   gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_user), "");
-   gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_password), "");
-+  gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_modeminit), "");
- 
-   gkconnection_clear (connection);
- }
-@@ -617,21 +662,27 @@
-       g_free (file_name);
-       return;
-     }
--  g_free (file_name);
-   /*
-    * FIXME: need to get the modem device from somewhere 
-    */
--  fprintf (file, "# This optionfile was generated by %s %s.\n" "# \n" "#\n" "hide-password \n" "noauth\n" "connect \"/usr/sbin/chat -v -f /etc/chatscripts/%s\"\n" "debug\n" "%s\n"	/* modem 
--																							 * file 
--																							 */
--	   "115200\n" "defaultroute\n" "noipdefault\n" "user %s\n"	/* user 
--									 * name 
--									 */
--	   "remotename %s\n",	/* conn_name */
--	   PACKAGE, VERSION, connection->name, "/dev/modem",
--	   connection->user, connection->name);
-+  fprintf (file, "# This optionfile was generated by %s %s.\n" "# \n" "#\n" 
-+                 "hide-password \n" "noauth\n" 
-+                 "connect \"/usr/sbin/chat -v -f /etc/chatscripts/%s\"\n" 
-+                 "debug\n" "%s\n"	/* modem file */
-+	             "115200\n" "defaultroute\n" 
-+                 "noipdefault\n" "user %s\n"	/* user name */
-+	             "remotename %s\n",	/* conn_name */
-+                 PACKAGE, VERSION, connection->name, "/dev/modem",
-+	             connection->user, connection->name);
-+  if (connection->option1)
-+      fprintf(file, "%s\n", connection->option1);
-+  if (connection->option2)
-+      fprintf(file, "%s\n", connection->option2);
-   fclose (file);
-+  if (chmod (file_name, S_IWUSR | S_IRGRP | S_IRUSR | S_IROTH))
-+	  perror("err");
- 
-+  g_free (file_name);
-   /*
-    * writes /etc/chatscripts/${peer} 
-    */
-@@ -646,16 +697,15 @@
-       g_free (file_name);
-       return;
-     }
--  g_free (file_name);
-   /*
-    * FIXME: need to get the modem device from somewhere 
-    */
--  fprintf (file, "# This chatfile was generated by %s %s.\n" "# Please do not delete any of the comments. " "Pppconfig and GkDial need them.\n" "# \n" "# ispauth %s\n"	/* auth 
--																					 */
--	   "# abortstring\n" "ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'" "ABORT 'NO DIAL TONE' ABORT 'NO ANSWER'\n" "# modeminit\n" "'' ATZ\n"	/* FIXME! 
--																					 */
--	   "# ispnumber\n" "OK-AT-OK ATDT%s\n"	/* phone - FIXME! Tone or
--						 * Pulse */
-+  fprintf (file, "# This chatfile was generated by %s %s.\n" "# Please do not delete any of the comments. " "Pppconfig and GkDial need them.\n" "# \n" 
-+	   "# ispauth %s\n"	/* auth  */
-+	   "# abortstring\n" "ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'" "ABORT 'NO DIAL TONE' ABORT 'NO ANSWER'\n" 
-+	   "# modeminit\n" "'' '%s'\n"	/* FIXME! */
-+       "TIMEOUT 120\n"
-+	   "# ispnumber\n" "OK-AT-OK ATDT%s\n"	/* phone - FIXME! Tone or Pulse */
- 	   "# ispconnect\n"
- 	   "CONNECT \\d\\c\n"
- 	   "# prelogin\n"
-@@ -665,8 +715,12 @@
- 	   "# postlogin\n"
- 	   "\n"
- 	   "# end of pppconfig stuff\n",
--	   PACKAGE, VERSION, connection->auth_type, connection->phone);
-+	   PACKAGE, VERSION, connection->auth_type, connection->modeminit ? connection->modeminit : "ATZ", connection->phone);
-+
-   fclose (file);
-+  if (chmod (file_name, S_IWUSR | S_IRGRP | S_IRUSR | S_IROTH))
-+	  perror("err");
-+  g_free (file_name);
- 
-   /*
-    * remove the old user/pass entry before adding the new 
-@@ -684,7 +738,7 @@
-    * writes /etc/ppp/${auth}-secrets 
-    */
-   {
--    gchar *secrets_name;
-+    gchar *secrets_name = NULL;
- 
-     if (!strcmp (connection->auth_type, "PAP"))
-       secrets_name = g_strdup ("pap");
-@@ -743,7 +797,7 @@
- 	gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_conn_name),
- 				0, -1);
-       if (!strcmp (tmp, ""))
--	g_free (tmp);
-+        g_free (tmp);
-       else
- 	{
- 	  g_free (connection->name);
-@@ -759,7 +813,7 @@
-     {
-       g_free (connection->phone);
-       connection->phone =
--	gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_phone), 0, -1);
-+        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_phone), 0, -1);
-     }
-   else if (!strcmp (entry_name, "user"))
-     {
-@@ -780,4 +834,22 @@
-       connection->auth_type =
- 	gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_auth), 0, -1);
-     }
-+  else if (!strcmp (entry_name, "modeminit"))
-+    {
-+      g_free (connection->modeminit);
-+      connection->modeminit =
-+        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_modeminit), 0, -1);
-+    }
-+  else if (!strcmp (entry_name, "option1"))
-+    {
-+      g_free (connection->option1);
-+      connection->option1 =
-+        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_option1), 0, -1);
-+    }
-+  else if (!strcmp (entry_name, "option2"))
-+    {
-+      g_free (connection->option2);
-+      connection->option2 =
-+        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_option2), 0, -1);
-+    }
- }
-diff -Nur gkdial-1.8.1.orig/src/defines.h gkdial-1.8.1/src/defines.h
---- gkdial-1.8.1.orig/src/defines.h	2003-06-27 01:14:51.000000000 +0200
-+++ gkdial-1.8.1/src/defines.h	2004-09-29 14:59:38.000000000 +0200
-@@ -51,6 +51,6 @@
- #define CHK_TIMEOUT 1000	/* check_connection */
- #define CNT_TIMEOUT 47000	/* connecting_check */
- 
--#define DEBUG 1
-+#define DEBUG 0
- 
- #endif
-diff -Nur gkdial-1.8.1.orig/src/details.c gkdial-1.8.1/src/details.c
---- gkdial-1.8.1.orig/src/details.c	2003-06-27 01:14:51.000000000 +0200
-+++ gkdial-1.8.1/src/details.c	2004-10-16 11:30:29.000000000 +0200
-@@ -40,10 +40,11 @@
-       gtk_widget_destroy (dialog);
- 
-       if (response == GTK_RESPONSE_YES)
--	gk_disconnect (NULL, gkdial);
-+      {
-+          gk_disconnect (NULL, gkdial);
-+          gk_status_set_disconnected(gkdial);
-+      }
-     }
--
--  gtk_main_quit ();
- }
- 
- void
-diff -Nur gkdial-1.8.1.orig/src/gkdial.h gkdial-1.8.1/src/gkdial.h
---- gkdial-1.8.1.orig/src/gkdial.h	2003-06-27 04:34:21.000000000 +0200
-+++ gkdial-1.8.1/src/gkdial.h	2004-10-14 18:55:22.000000000 +0200
-@@ -32,6 +32,8 @@
-   gchar *password;
- 
-   gchar *auth_type;
-+  gchar *modeminit;
-+  gchar *option1, *option2;
- };
- 
- typedef struct _GkDial GkDial;
-@@ -80,6 +82,8 @@
-    */
-   GtkWidget *button_connect;
-   GtkWidget *button_disconnect;
-+  GtkWidget *button_quit;
-+  GtkWidget *button_preferences;
- 
-   /*
-    * misc buttons 
-@@ -166,6 +170,9 @@
-   GtkWidget *cp_entry_user;
-   GtkWidget *cp_entry_password;
-   GtkWidget *cp_entry_auth;
-+  GtkWidget *cp_entry_modeminit;
-+  GtkWidget *cp_entry_option1;
-+  GtkWidget *cp_entry_option2;
- 
-   gint editing_status;
- 
-diff -Nur gkdial-1.8.1.orig/src/main.c gkdial-1.8.1/src/main.c
---- gkdial-1.8.1.orig/src/main.c	2003-06-27 04:47:54.000000000 +0200
-+++ gkdial-1.8.1/src/main.c	2004-10-16 11:30:29.000000000 +0200
-@@ -38,10 +38,11 @@
- void
- gkdial_show_about (GtkWidget * widget, gpointer data)
- {
--  gchar *translator_credits = g_strdup (_("translator_credits"));
-+  gchar *translator_credits = 
-+	g_strdup (_("Adapted to GPE by Florian Boor <florian@kernelconcepts.de>"));
- 
-   gk_dialog (GTK_MESSAGE_INFO,
--	     _("GkDial %s\n\n"
-+	     _("Internet Dialler (GkDial) %s\n\n"
- 	       "A PPP setup and dialing tool for GNOME.\n\n"
- 	       "Author:\n\n"
- 	       "\tGustavo Noronha Silva <kov@debian.org>\n\n"
-@@ -52,6 +53,7 @@
-   g_free (translator_credits);
- }
- 
-+
- int
- gkdial_defaults_init (GkDial * gkdial)
- {
-@@ -101,7 +103,7 @@
-   /*
-    * GUI stuff 
-    */
--  gkdial->main_window = glade_xml_get_widget (gkdial->gui, "main_window");
-+  gkdial->main_window = glade_xml_get_widget (gkdial->gui, "gk_main_window");
-   gkdial->main_combo = glade_xml_get_widget (gkdial->gui, "main_combo");
- 
-   gkdial->menu_new = glade_xml_get_widget (gkdial->gui, "menu_new");
-@@ -121,6 +123,10 @@
- 						 "button_connect");
-   gkdial->button_disconnect = glade_xml_get_widget (gkdial->gui,
- 						    "button_disconnect");
-+  gkdial->button_quit = glade_xml_get_widget (gkdial->gui,
-+						    "button_quit");
-+  gkdial->button_preferences = glade_xml_get_widget (gkdial->gui,
-+						    "button_preferences");
- 
-   gkdial->label_set_time = glade_xml_get_widget (gkdial->gui,
- 						 "label_set_time");
-@@ -208,6 +214,12 @@
- 		     "name", "password");
-   gkdial->cp_entry_auth = glade_xml_get_widget (gkdial->gui, "cp_entry_auth");
-   g_object_set_data (G_OBJECT (gkdial->cp_entry_auth), "name", "auth");
-+  gkdial->cp_entry_modeminit = glade_xml_get_widget (gkdial->gui, "cp_entry_modeminit");
-+  g_object_set_data (G_OBJECT (gkdial->cp_entry_modeminit), "name", "modeminit");
-+  gkdial->cp_entry_option1 = glade_xml_get_widget (gkdial->gui, "cp_entry_option1");
-+  g_object_set_data (G_OBJECT (gkdial->cp_entry_option1), "name", "option1");
-+  gkdial->cp_entry_option2 = glade_xml_get_widget (gkdial->gui, "cp_entry_option2");
-+  g_object_set_data (G_OBJECT (gkdial->cp_entry_option2), "name", "option2");
- 
-   /*
-    * GkConnection 
-@@ -222,6 +234,9 @@
-     conn->user = NULL;
-     conn->password = NULL;
-     conn->auth_type = NULL;
-+    conn->modeminit = NULL;
-+    conn->option1 = NULL;
-+    conn->option2 = NULL;
-   }
-   nullify_connection (gkdial->connection);
-   nullify_connection (gkdial->connection_backup);
-@@ -312,26 +327,30 @@
-   g_signal_connect (G_OBJECT (gkdial->menu_quit), "activate",
- 		    G_CALLBACK (gtk_main_quit), NULL);
- 
--  /*
--   * FIXME!: needs to select the connection on the peers_list, based on
--   * the combo selection
--   * 
--   * g_signal_connect (G_OBJECT(gkdial->menu_properties), "activate",
--   * G_CALLBACK(gkdial_connedit_menu_show), gkdial); 
--   */
-+  g_signal_connect (G_OBJECT(gkdial->menu_properties), "activate",
-+            G_CALLBACK(gkdial_connedit_show), gkdial); 
-+   
-   g_signal_connect (G_OBJECT (gkdial->menu_preferences), "activate",
- 		    G_CALLBACK (gkdial_prefs_show), gkdial);
- 
-   g_signal_connect (G_OBJECT (gkdial->menu_about), "activate",
- 		    G_CALLBACK (gkdial_show_about), gkdial);
- 
--  /*
-+  g_signal_connect_after (G_OBJECT (GTK_COMBO(gkdial->main_combo)->entry), 
-+            "changed", G_CALLBACK (gkdial_main_select_peer), gkdial);
-+			
-+  g_signal_connect (G_OBJECT (gkdial->button_quit), "clicked",
-+		    G_CALLBACK (gtk_main_quit), NULL);
-+
-+  g_signal_connect (G_OBJECT (gkdial->button_preferences), "clicked",
-+		    G_CALLBACK (gkdial_prefs_show), gkdial);
-+ /*
-    * connection handling buttons 
-    */
-   g_signal_connect (G_OBJECT (gkdial->button_connect), "clicked",
- 		    G_CALLBACK (gk_connect), gkdial);
-   g_signal_connect (G_OBJECT (gkdial->button_disconnect), "clicked",
--		    G_CALLBACK (gk_disconnect), gkdial);
-+		    G_CALLBACK (gkdial_details_close), gkdial);
- 
-   /*
-    * details window 
-@@ -382,6 +401,12 @@
- 		    G_CALLBACK (cp_entry_changed_cb), gkdial);
-   g_signal_connect (G_OBJECT (gkdial->cp_entry_auth), "changed",
- 		    G_CALLBACK (cp_entry_changed_cb), gkdial);
-+  g_signal_connect (G_OBJECT (gkdial->cp_entry_modeminit), "changed",
-+		    G_CALLBACK (cp_entry_changed_cb), gkdial);
-+  g_signal_connect (G_OBJECT (gkdial->cp_entry_option1), "changed",
-+		    G_CALLBACK (cp_entry_changed_cb), gkdial);
-+  g_signal_connect (G_OBJECT (gkdial->cp_entry_option2), "changed",
-+		    G_CALLBACK (cp_entry_changed_cb), gkdial);
- 
-   /*
-    * general 
-@@ -416,7 +441,7 @@
-   gkdial.add_only = FALSE;
-   gkdial.edit_only = FALSE;
-   gkdial.remove_only = FALSE;
--  char c;
-+  int c;
- 
-   /*
-    * it seems like poff kills gkdial together with it's children, so
-@@ -508,7 +533,11 @@
-   gkdial_tray_init (&gkdial);
- 
-   if (!gkdial.mw_starts_hiden && !GTK_WIDGET_VISIBLE (gkdial.main_window))
--    gtk_widget_show (gkdial.main_window);
-+    {
-+      gtk_widget_show (gkdial.main_window);
-+      if (gkdial.always_tray && gkdial.tray)
-+	    gtk_widget_show_all (gkdial.tray);
-+    }
-   else
-     {
-       if (gkdial.tray)
-diff -Nur gkdial-1.8.1.orig/src/main_loop.c gkdial-1.8.1/src/main_loop.c
---- gkdial-1.8.1.orig/src/main_loop.c	2003-06-27 23:32:32.000000000 +0200
-+++ gkdial-1.8.1/src/main_loop.c	2004-10-16 11:30:29.000000000 +0200
-@@ -114,14 +114,22 @@
-       g_free (statusbar_text);
-     }
-   else
--    gtk_statusbar_push (GTK_STATUSBAR (gkdial->details_statusbar),
--			gkdial->status_state_id, _("Dialing..."));
-+    {
-+      gchar *status_phone;
-+      
-+      status_phone = g_strdup_printf (_("Dialling %s"),  
-+        gtk_editable_get_chars (GTK_EDITABLE (
-+                                  GTK_COMBO (gkdial->main_combo)->entry), 0, -1));
-+      gtk_statusbar_push (GTK_STATUSBAR (gkdial->details_statusbar),
-+	  		  gkdial->status_state_id, status_phone);
-+      g_free (status_phone);
-+    }
- 
-   if (gkdial->connected_to)
--    gkdial_details_set_title (gkdial, _("Connecting to: %s - GkDial"),
-+    gkdial_details_set_title (gkdial, _("Connecting to: %s"),
- 			      gkdial->connected_to);
-   else
--    gkdial_details_set_title (gkdial, _("Connecting to: unknown - GkDial"));
-+    gkdial_details_set_title (gkdial, _("Connecting"));
- 
-   gtk_image_set_from_pixbuf (GTK_IMAGE (gkdial->tray_icon),
- 			     gkdial->pixbuf_ppp_trying);
-@@ -136,11 +144,8 @@
-       gtk_widget_hide (gkdial->menu_item_connect);
-       gtk_widget_show (gkdial->menu_item_disconnect);
-     }
--  if (GTK_WIDGET_VISIBLE (gkdial->main_window))
--    {
--      gtk_widget_hide (gkdial->main_window);
--      gtk_widget_show (gkdial->details_window);
--    }
-+  gtk_widget_show (gkdial->details_window);
-+  gtk_window_present(GTK_WINDOW(gkdial->details_window));
- 
-   /*
-    * start clock 
-@@ -206,7 +211,7 @@
- 	  gtk_widget_show (gkdial->main_window);
- 	}
- 
--      gkdial_details_set_title (gkdial, _("Disconnected - GkDial"));
-+      gkdial_details_set_title (gkdial, _("Disconnected"));
-       if (gkdial->connected_to != NULL)
- 	{
- 	  g_free (gkdial->connected_to);
-@@ -234,10 +239,10 @@
- 		      gkdial->status_state_id, _("Connected."));
- 
-   if (gkdial->connected_to)
--    gkdial_details_set_title (gkdial, _("Connected to: %s - GkDial"),
-+    gkdial_details_set_title (gkdial, _("Connected to: %s"),
- 			      gkdial->connected_to);
-   else
--    gkdial_details_set_title (gkdial, _("Connected to: unknown - GkDial"));
-+    gkdial_details_set_title (gkdial, _("Connected to: unknown"));
- 
-   gtk_image_set_from_pixbuf (GTK_IMAGE (gkdial->tray_icon),
- 			     gkdial->pixbuf_ppp_none);
-@@ -252,11 +257,7 @@
-       gtk_widget_hide (gkdial->menu_item_connect);
-       gtk_widget_show (gkdial->menu_item_disconnect);
-     }
--  if (GTK_WIDGET_VISIBLE (gkdial->main_window))
--    {
--      gtk_widget_hide (gkdial->main_window);
--      gtk_widget_show (gkdial->details_window);
--    }
-+  gtk_widget_show (gkdial->details_window);
- #ifdef DEBUG
- 	fprintf (stderr, "hide_dw_on_conn: %d\n",
- 		gkdial->hide_dw_on_conn);
-@@ -292,7 +293,6 @@
- 			     gkdial->connected_to);
-   gkdial_exec (gkdial, command, CONNECTING);
-   g_free (command);
--  pthread_exit (NULL);
- }
- 
- void
-@@ -313,13 +313,10 @@
- 
-   gkdial->was_gkdial = TRUE;
- 
--  gkdial_details_set_title (gkdial, _("Connecting to: %s - GkDial"),
-+  gkdial_details_set_title (gkdial, _("Connecting to: %s"),
- 			    gkdial->connected_to);
--
--	g_free (gkdial->connecting_thread);
--  gkdial->connecting_thread = g_new (pthread_t, 1);
--  pthread_create (gkdial->connecting_thread, NULL,
--		  gk_thread_connect, (gpointer) gkdial);
-+  
-+  gk_thread_connect ((gpointer) gkdial);
- }
- 
- /*
-@@ -330,7 +327,7 @@
- {
-   GkDial *gkdial = (GkDial *) data;
-   gchar *disconnect_cmd = DOWNCMD;
--
-+    
-   /*
-    * this shows that gkdial was the responsible for the connection being 
-    * closed 
-diff -Nur gkdial-1.8.1.orig/src/peers_list.c gkdial-1.8.1/src/peers_list.c
---- gkdial-1.8.1.orig/src/peers_list.c	2003-06-27 01:14:51.000000000 +0200
-+++ gkdial-1.8.1/src/peers_list.c	2004-10-16 11:30:29.000000000 +0200
-@@ -15,8 +15,7 @@
- {
-   GtkTreeStore *tree_model;
- 
--  tree_model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING);	/* peer 
--										 */
-+  tree_model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING);	/* peer */
- 
-   return tree_model;
- }
-@@ -317,6 +316,9 @@
- 	    if (!strcmp (tmp, ".bak"))
- 	      continue;
- 
-+      if (!strcmp(files_peers->d_name, "lap"))
-+        continue;
-+        
- 	  /*
- 	   * for the prefs peers_list 
- 	   */
-@@ -356,15 +358,20 @@
- 
-       if (peer_to_select && strcmp ("", peer_to_select))
- 	{
-+      GtkTreeIter *iter;
- #ifdef DEBUG
- 	  printf ("setting combo to: %s\n", peer_to_select);
- #endif
- 	  prefs_peers_set_default (gkdial, peer_to_select);
- 	  combo_set_selection (gkdial, peer_to_select);
-+      iter = prefs_peers_list_find (gkdial, peer_to_select);
-+      prefs_peers_list_select (gkdial, iter);
-+      gtk_tree_iter_free (iter);
- 	}
-       else
- 	{
- 	  GList *first_peer;
-+      GtkTreeIter *iter;
- 
- 	  first_peer = g_list_first (peers_list);
- #ifdef DEBUG
-@@ -372,6 +379,10 @@
- 		  (gchar *) first_peer->data);
- #endif
- 	  combo_set_selection (gkdial, (gchar *) first_peer->data);
-+
-+      iter = prefs_peers_list_find (gkdial, first_peer->data);
-+      prefs_peers_list_select (gkdial, iter);
-+      gtk_tree_iter_free (iter);
- 	}
-     }
- 
-@@ -395,3 +406,22 @@
- 
-   peers_list_fill (gkdial, TRUE);
- }
-+
-+void
-+gkdial_main_select_peer (GtkWidget * widget, gpointer data)
-+{
-+  GkDial *gkdial = data;
-+  gchar *peer_to_select;
-+  GtkTreeIter *iter;
-+	
-+  peer_to_select =
-+	    gtk_editable_get_chars (GTK_EDITABLE
-+				    (GTK_COMBO (gkdial->main_combo)->entry), 0, -1);
-+	
-+  iter = prefs_peers_list_find (gkdial, peer_to_select);
-+  if (iter)
-+  {
-+    prefs_peers_list_select (gkdial, iter);
-+    gtk_tree_iter_free (iter);
-+  }
-+}
-diff -Nur gkdial-1.8.1.orig/src/peers_list.h gkdial-1.8.1/src/peers_list.h
---- gkdial-1.8.1.orig/src/peers_list.h	2003-06-27 01:14:51.000000000 +0200
-+++ gkdial-1.8.1/src/peers_list.h	2004-08-26 18:00:27.000000000 +0200
-@@ -15,6 +15,8 @@
-   NUM_COLUMNS
- };
- 
-+void gkdial_main_select_peer (GtkWidget * widget, gpointer data);
-+
- void prefs_peers_list_select (GkDial * gkdial, GtkTreeIter * iter);
- 
- gboolean peers_list_get_selected (GkDial * gkdial);
-diff -Nur gkdial-1.8.1.orig/src/ppp_info.c gkdial-1.8.1/src/ppp_info.c
---- gkdial-1.8.1.orig/src/ppp_info.c	2003-06-27 01:14:51.000000000 +0200
-+++ gkdial-1.8.1/src/ppp_info.c	2004-10-16 11:30:29.000000000 +0200
-@@ -11,7 +11,7 @@
- 
- #include <linux/if.h>
- #include <linux/ppp_defs.h>
--#include <linux/ppp.h>
-+#include <linux/if_ppp.h>
- 
- #include <time.h>
- #include <ctype.h>
-diff -Nur gkdial-1.8.1.orig/src/tray.c gkdial-1.8.1/src/tray.c
---- gkdial-1.8.1.orig/src/tray.c	2003-06-27 01:14:51.000000000 +0200
-+++ gkdial-1.8.1/src/tray.c	2004-10-16 11:30:29.000000000 +0200
-@@ -6,24 +6,32 @@
- #include "prefs.h"
- #include "images.h"
- #include "main_loop.h"
--
-+static GtkWidget *menu;
-+ 
- gboolean
- tray_icon_clicked (GtkWidget * w, GdkEventButton * event, gpointer data)
- {
-   GkDial *gkdial = (GkDial *) data;
-   GtkWidget *window_to_handle;
- 
--  if (gkdial->state == CONNECTING || gkdial->state == CONNECTED)
--    window_to_handle = gkdial->details_window;
--  else
--    window_to_handle = gkdial->main_window;
--
--  if (event->button != 3)
-+  if (event->type == GDK_BUTTON_PRESS)
-     {
--      if (GTK_WIDGET_VISIBLE (window_to_handle))
--	gtk_widget_hide (window_to_handle);
-+      gtk_menu_popup (GTK_MENU (menu),
-+			NULL, NULL,
-+			NULL, w, event->button, event->time);
-+		//gnome_popup_menu_do_popup (menu, NULL, NULL, NULL, NULL, NULL);
-+        return TRUE;
-+	}
-+	
-+  if (event->type == GDK_2BUTTON_PRESS)
-+    {
-+      if (gkdial->state == CONNECTING || gkdial->state == CONNECTED)
-+        window_to_handle = gkdial->details_window;
-       else
--	gtk_widget_show (window_to_handle);
-+        window_to_handle = gkdial->main_window;
-+
-+      if (!GTK_WIDGET_VISIBLE (window_to_handle))
-+        gtk_widget_show (window_to_handle);
-       return TRUE;
-     }
-   else
-@@ -43,7 +51,20 @@
- void
- tray_exit_cb (GtkWidget * w, gpointer data)
- {
--  gtk_main_quit ();
-+  GtkWidget *dialog;
-+  GkDial *gkdial = data;
-+  
-+  dialog = gtk_message_dialog_new(GTK_WINDOW(gkdial->main_window), 
-+                                  GTK_DIALOG_MODAL,
-+                                  GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO, 
-+                                  _("Quit Dialler?"));
-+  gtk_widget_show_all(dialog);
-+  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES)
-+    {
-+      gtk_widget_destroy(dialog);  
-+      gtk_main_quit ();
-+    }
-+  gtk_widget_destroy(dialog);  
- }
- 
- GtkWidget *
-@@ -54,11 +75,10 @@
-      G_CALLBACK (gkdial_prefs_show)},
-     {N_("Co_nnect"), GTK_STOCK_YES, G_CALLBACK (gk_connect)},
-     {N_("Di_sconnect"), GTK_STOCK_NO, G_CALLBACK (gk_disconnect)},
--    {N_("E_xit"), GTK_STOCK_CLOSE, G_CALLBACK (tray_exit_cb)},
-+    {N_("_Quit"), GTK_STOCK_QUIT, G_CALLBACK (tray_exit_cb)},
-     {NULL, NULL, NULL}
-   };
- 
--  GtkWidget *menu;
-   int i;
- 
-   menu = gtk_menu_new ();
-@@ -83,14 +103,14 @@
-       gtk_widget_show (item);
- 
-       if (menuitems[i].callback == G_CALLBACK (gk_connect))
--	gkdial->menu_item_connect = item;
-+        gkdial->menu_item_connect = item;
-       else if (menuitems[i].callback == G_CALLBACK (gk_disconnect))
- 	{
- 	  gkdial->menu_item_disconnect = item;
- 	  gtk_widget_hide (gkdial->menu_item_disconnect);
- 	}
-       else if (menuitems[i].callback == G_CALLBACK (gkdial_prefs_show))
--	gkdial->menu_item_prefs = item;
-+        gkdial->menu_item_prefs = item;
- 
-       gtk_menu_shell_append ((GtkMenuShell *) (menu), item);
-       if (menuitems[i].callback != NULL)
-@@ -109,7 +129,7 @@
-   GtkWidget *box;
-   GdkPixbuf *pixbuf;
- 
--  gkdial->tray = GTK_WIDGET (egg_tray_icon_new ("GkDial Tray Icon"));
-+  gkdial->tray = GTK_WIDGET (egg_tray_icon_new ("Dialler Tray Icon"));
- 
-   box = gtk_event_box_new ();
-   g_signal_connect (G_OBJECT (box), "button_press_event",
-@@ -118,13 +138,6 @@
- 
-   gkdial->tray_icon = gtk_image_new_from_pixbuf (gkdial->pixbuf_ppp_off);
-   gtk_container_add (GTK_CONTAINER (box), gkdial->tray_icon);
--
--  /*
--   * from gnome-cd gcd->tray_tips = gtk_tooltips_new ();
--   * gtk_tooltips_set_tip (GTK_TOOLTIPS(gcd->tray_tips), gcd->tray,
--   * _("CD Player"), NULL); 
--   */
--
--  gnome_popup_menu_attach (tray_menu_init (gkdial), box, NULL);
--
-+tray_menu_init (gkdial);
-+  //gnome_popup_menu_attach (tray_menu_init (gkdial), box, NULL);
- }
-diff -Nur gkdial-1.8.1.orig/src/util.c gkdial-1.8.1/src/util.c
---- gkdial-1.8.1.orig/src/util.c	2003-06-27 22:30:29.000000000 +0200
-+++ gkdial-1.8.1/src/util.c	2004-10-16 11:30:29.000000000 +0200
-@@ -76,8 +76,7 @@
-     {
-     case 0:
-       gk_dialog (GTK_MESSAGE_INFO,
--		 _("The connection was normaly finished\n"
--		   "by another application."));
-+		 _("Connection timed out.\nIs your modem connected?"));
-       break;
-     case 1:
-       gk_dialog (GTK_MESSAGE_ERROR,
-@@ -86,11 +85,11 @@
-       break;
-     case 2:
-       gk_dialog (GTK_MESSAGE_ERROR,
--		 _("Options error when running:\n%s."), gkdial->command);
-+		 _("No modem or bad options."));
-       retry_connection = FALSE;
-       break;
-     case 3:
--      gk_dialog (GTK_MESSAGE_ERROR,
-+      gk_dialog (GTK_MESSAGE_INFO,
- 		 _("You are not allowed to run:\n%s."), gkdial->command);
-       retry_connection = FALSE;
-       break;
-@@ -105,17 +104,17 @@
- 			    gkdial->status_state_id,
- 			    _("Connection terminated by signal..."));
-       else
--	gk_dialog (GTK_MESSAGE_ERROR,
-+	gk_dialog (GTK_MESSAGE_INFO,
- 		   _("The connection was terminated prematurely "
- 		     "by a signal it received."));
-       break;
-     case 6:
--      gk_dialog (GTK_MESSAGE_ERROR,
-+      gk_dialog (GTK_MESSAGE_INFO,
- 		 _("The serial port could not be locked."));
-       retry_connection = FALSE;
-       break;
-     case 7:
--      gk_dialog (GTK_MESSAGE_ERROR,
-+      gk_dialog (GTK_MESSAGE_INFO,
- 		 _("The serial port could not be opened."));
-       retry_connection = FALSE;
-       break;
-@@ -125,13 +124,13 @@
- 			    gkdial->status_state_id,
- 			    _("Connection failed..."));
-       else
--	gk_dialog (GTK_MESSAGE_ERROR,
-+	gk_dialog (GTK_MESSAGE_INFO,
- 		   _("A connection was being tried but could not\n"
- 		     "be completed. Check the /var/log/syslog file\n"
- 		     "for details."));
-       break;
-     case 9:
--      gk_dialog (GTK_MESSAGE_ERROR,
-+      gk_dialog (GTK_MESSAGE_INFO,
- 		 _("The command specified as argumento to the\n"
- 		   "pty option could not be run."));
-       retry_connection = FALSE;
-@@ -142,7 +141,7 @@
- 			    gkdial->status_state_id,
- 			    _("PPP negotiation failed."));
-       else
--	gk_dialog (GTK_MESSAGE_ERROR, _("PPP negotiation failed."));
-+	gk_dialog (GTK_MESSAGE_INFO, _("PPP negotiation failed."));
-       break;
-     case 11:
-       if (retry_connection)
-@@ -150,7 +149,7 @@
- 			    gkdial->status_state_id,
- 			    _("Peer did not authenticate itself."));
-       else
--	gk_dialog (GTK_MESSAGE_ERROR, _("Peer did not authenticate itself."));
-+	gk_dialog (GTK_MESSAGE_INFO, _("Peer did not authenticate itself."));
-       break;
-     case 12:
-       gk_dialog (GTK_MESSAGE_INFO,
-@@ -158,7 +157,7 @@
-       retry_connection = FALSE;
-       break;
-     case 13:
--      gk_dialog (GTK_MESSAGE_ERROR,
-+      gk_dialog (GTK_MESSAGE_INFO,
- 		 _("Connection terminated because it reached\n"
- 		   "the time limit."));
-       retry_connection = FALSE;
-@@ -298,7 +297,7 @@
- 	{
- 	  printf ("%s\n", gk_args[0]);
- 	  gk_dialog (GTK_MESSAGE_ERROR,
--		     _("Error! Could not execute %s."), gk_args[0]);
-+                 _("Error! Could not execute %s."), gk_args[0]);
- 	}
-     }
-   else if (pid == -1)
-@@ -306,23 +305,35 @@
-   else
-     {
-       if (what == CONNECTING)
--	{
--	  waitpid (pid, &status, 0);
--
--	  /*
--	   * unlock state 
--	   */
--	  gkdial->state_locked = FALSE;
--
--	  if (WIFEXITED (status))
--	    {
--	      gkdial->return_code = WEXITSTATUS (status);
--			g_free (gkdial->command);
--	      gkdial->command = g_strdup (command);
--	    }
--	}
--      else
--	wait (NULL);
-+        {
-+          waitpid (pid, &status, 0);
-+    
-+          /*
-+           * unlock state 
-+           */
-+          gkdial->state_locked = FALSE;
-+    
-+          if (WIFEXITED (status))
-+            {
-+              gkdial->return_code = WEXITSTATUS (status);
-+                g_free (gkdial->command);
-+              gkdial->command = g_strdup (command);
-+            }
-+        }
-+        else
-+        {
-+          waitpid (pid, &status, 0);
-+    
-+          if (WIFEXITED (status) && WEXITSTATUS (status))
-+            {
-+              gk_dialog (GTK_MESSAGE_ERROR,
-+                 _("<b>An error ocurred when trying to disconnect.</b>"
-+                   "\n\n"
-+                   "You may not have the needed permissions or "
-+                   "there was no connection to be finished "
-+                   "(stale lock file?)."));
-+            }
-+        }
-     }
- 
- 	for (i = 0; gk_args[i] != NULL; i++)
-@@ -336,13 +347,13 @@
-   gint a;
-   pid_t pid;
-   gchar **command;
-+  gchar *fcmd = g_strdup_printf("%s > /dev/null 2>&1",cmd);
- 
--  command = g_malloc (sizeof (gchar *) * 5);
--  command[0] = g_strdup ("/usr/bin/gksu");
--  command[1] = g_strdup ("-m");
--  command[2] = g_strdup (msg);
--  command[3] = g_strdup (cmd);
--  command[4] = NULL;
-+  command = g_malloc (sizeof (gchar *) * 4);
-+  command[0] = g_strdup (PREFIX "/bin/gpe-su");
-+  command[1] = g_strdup ("-c");
-+  command[2] = fcmd;
-+  command[3] = NULL;
- 
-   pid = fork ();
-   if (pid == 0)
diff --git a/packages/gkdial/gkdial/gkdial-ungnome.patch b/packages/gkdial/gkdial/gkdial-ungnome.patch
deleted file mode 100644
index 6f742fdcdb..0000000000
--- a/packages/gkdial/gkdial/gkdial-ungnome.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- configure.in.orig	2005-01-23 23:46:16.000000000 +0100
-+++ configure.in	2005-01-23 23:47:46.000000000 +0100
-@@ -10,8 +10,7 @@
- AM_PROG_CC_STDC
- AC_HEADER_STDC
- 
--pkg_modules="gtk+-2.0 >= 2.0.0, libglade-2.0 >= 2.0.0 gconf-2.0 >= 2.0.0 \
--libgnomeui-2.0 >= 1.102.0 libgnome-2.0 >= 2.0"
-+pkg_modules="gtk+-2.0 >= 2.0.0, libglade-2.0 >= 2.0.0 gconf-2.0 >= 2.0.0"
- 
- PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
- AC_SUBST(PACKAGE_CFLAGS)
---- src/main.c.orig	2005-01-24 00:07:02.000000000 +0100
-+++ src/main.c	2005-01-24 00:08:39.000000000 +0100
-@@ -10,8 +10,6 @@
- #include <gtk/gtk.h>
- #include <glade/glade.h>
- #include <gconf/gconf-client.h>
--#include <libgnome/libgnome.h>
--#include <libgnomeui/libgnomeui.h>
- 
- #include "gkdial.h"
- #include "defines.h"
-@@ -457,8 +455,7 @@
- 
-   gtk_set_locale ();
- 
--  gnome_program_init (PACKAGE, VERSION,
--		      LIBGNOMEUI_MODULE, argc, argv, GNOME_PARAM_NONE);
-+  gtk_init(&argc, &argv);
- 
-   glade_init ();
- 
diff --git a/packages/gkdial/gkdial/gkdial.desktop b/packages/gkdial/gkdial/gkdial.desktop
deleted file mode 100644
index 7293043734..0000000000
--- a/packages/gkdial/gkdial/gkdial.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Modem Dialer
-Comment=Configure and start modem connections
-Exec=gkdial
-Terminal=false
-Type=Application
-Icon=gkdial.png
-Categories=Application;Utility;PPP;
-StartupNotify=true
diff --git a/packages/gkdial/gkdial/gkdial.png b/packages/gkdial/gkdial/gkdial.png
deleted file mode 100644
index 22a9b05a0b..0000000000
--- a/packages/gkdial/gkdial/gkdial.png
+++ /dev/null
diff --git a/packages/gkdial/gkdial/header.patch b/packages/gkdial/gkdial/header.patch
deleted file mode 100644
index 974afa7b10..0000000000
--- a/packages/gkdial/gkdial/header.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gkdial-1.8.1-gnomeless/src/ppp_info.c~	2003-06-27 00:14:51.000000000 +0100
-+++ gkdial-1.8.1-gnomeless/src/ppp_info.c	2004-06-11 11:24:03.000000000 +0100
-@@ -11,7 +11,7 @@
- 
- #include <linux/if.h>
- #include <linux/ppp_defs.h>
--#include <linux/ppp.h>
-+#include <linux/if_ppp.h>
- 
- #include <time.h>
- #include <ctype.h>
diff --git a/packages/gkdial/gkdial_1.8.1.bb b/packages/gkdial/gkdial_1.8.1.bb
deleted file mode 100644
index 3208a06f00..0000000000
--- a/packages/gkdial/gkdial_1.8.1.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-inherit autotools pkgconfig gconf
-
-DESCRIPTION = "GTK PPP dialing tool"
-DEPENDS = "gconf-dbus gtk+ libglade gettext ppp gpe-su"
-RDEPENDS = "ppp gconf-dbus gpe-su"
-SECTION = "gpe"
-PRIORITY = "optional"
-
-PR = "r3gpe1"
-
-SRC_URI = "http://familiar.handhelds.org/source/v0.8.2/${PN}-${PV}.tar.gz \
-           file://gkdial-pgpe.patch;patch=1 \
-           file://gkdial-ungnome.patch;patch=1;pnum=0 \
-           file://gkdial-gladedir.patch;patch=1;pnum=0 \
-           file://gkdial-gpepda.patch;patch=1;pnum=1 \
-           file://gkdial.desktop \
-           file://gkdial.png"
-
-FILES_${PN} = "${sysconfdir}/chatscripts ${bindir} ${datadir}/pixmaps ${datadir}/applications"
-FILES_${PN} += " ${datadir}/gkdial ${datadir}/gkdial/glade ${sysconfdir}/gconf/schemas"
-
-CFLAGS_append = " -I${STAGING_KERNEL_DIR}/include -D_GNU_SOURCE"
-LDFLAGS_append = " -Wl,--export-dynamic"
-
-do_install_append () {
-        mkdir -p  ${D}${datadir}/pixmaps
-        install -m 0644 ${WORKDIR}/gkdial.png ${D}${datadir}/pixmaps/gkdial.png
-        mkdir -p  ${D}${datadir}/applications
-        install -m 0644 ${WORKDIR}/gkdial.desktop ${D}${datadir}/applications/gkdial.desktop
-	mkdir -p ${D}${sysconfdir}/chatscripts
-        mkdir -p ${D}${sysconfdir}/gconf/schemas
-        install -m 0644 ${S}/gkdial.schemas ${D}${sysconfdir}/gconf/schemas/gkdial.schemas
-}