org.handhelds.familiar/packages/gkdial/gkdial/gkdial-pgpe.patch

   1 diff -Nur gkdial-1.8.1.orig/gkdial.glade gkdial-1.8.1/gkdial.glade
   2 --- gkdial-1.8.1.orig/gkdial.glade      2003-06-27 04:33:12.000000000 +0200
   3 +++ gkdial-1.8.1/gkdial.glade   2004-10-14 18:57:18.000000000 +0200
   4 @@ -2,16 +2,20 @@
   5  <!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
   6
   7  <glade-interface>
   8 -<requires lib="gnome"/>
   9
  10 -<widget class="GtkWindow" id="main_window">
  11 +<widget class="GtkWindow" id="gk_main_window">
  12    <property name="border_width">1</property>
  13 -  <property name="title" translatable="yes">GkDial</property>
  14 +  <property name="title" translatable="yes">Internet Dialler</property>
  15    <property name="type">GTK_WINDOW_TOPLEVEL</property>
  16    <property name="window_position">GTK_WIN_POS_CENTER</property>
  17    <property name="modal">False</property>
  18    <property name="resizable">False</property>
  19    <property name="destroy_with_parent">False</property>
  20 +  <property name="decorated">True</property>
  21 +  <property name="skip_taskbar_hint">False</property>
  22 +  <property name="skip_pager_hint">False</property>
  23 +  <property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
  24 +  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
  25
  26    <child>
  27      <widget class="GtkVBox" id="vbox4">
  28 @@ -27,7 +31,7 @@
  29           <child>
  30             <widget class="GtkMenuItem" id="connection1">
  31               <property name="visible">True</property>
  32 -             <property name="label" translatable="yes">_Connection</property>
  33 +             <property name="label" translatable="yes">Connec_tion</property>
  34               <property name="use_underline">True</property>
  35
  36               <child>
  37 @@ -40,7 +44,7 @@
  38                       <property name="use_underline">True</property>
  39
  40                       <child internal-child="image">
  41 -                       <widget class="GtkImage" id="image9">
  42 +                       <widget class="GtkImage" id="image18">
  43                           <property name="visible">True</property>
  44                           <property name="stock">gtk-add</property>
  45                           <property name="icon_size">1</property>
  46 @@ -56,13 +60,26 @@
  47                   <child>
  48                     <widget class="GtkImageMenuItem" id="menu_properties">
  49                       <property name="visible">True</property>
  50 -                     <property name="stock_item">GNOMEUIINFO_MENU_PROPERTIES_ITEM</property>
  51 +                     <property name="label" translatable="yes">_Properties</property>
  52 +                     <property name="use_underline">True</property>
  53                       <signal name="activate" handler="on_properties1_activate" last_modification_time="Thu, 29 May 2003 18:20:35 GMT"/>
  54 +
  55 +                     <child internal-child="image">
  56 +                       <widget class="GtkImage" id="image19">
  57 +                         <property name="visible">True</property>
  58 +                         <property name="stock">gtk-preferences</property>
  59 +                         <property name="icon_size">1</property>
  60 +                         <property name="xalign">0.5</property>
  61 +                         <property name="yalign">0.5</property>
  62 +                         <property name="xpad">0</property>
  63 +                         <property name="ypad">0</property>
  64 +                       </widget>
  65 +                     </child>
  66                     </widget>
  67                   </child>
  68
  69                   <child>
  70 -                   <widget class="GtkMenuItem" id="separator1">
  71 +                   <widget class="GtkSeparatorMenuItem" id="separator1">
  72                       <property name="visible">True</property>
  73                     </widget>
  74                   </child>
  75 @@ -70,7 +87,20 @@
  76                   <child>
  77                     <widget class="GtkImageMenuItem" id="menu_quit">
  78                       <property name="visible">True</property>
  79 -                     <property name="stock_item">GNOMEUIINFO_MENU_EXIT_ITEM</property>
  80 +                     <property name="label" translatable="yes">_Quit</property>
  81 +                     <property name="use_underline">True</property>
  82 +
  83 +                     <child internal-child="image">
  84 +                       <widget class="GtkImage" id="image20">
  85 +                         <property name="visible">True</property>
  86 +                         <property name="stock">gtk-quit</property>
  87 +                         <property name="icon_size">1</property>
  88 +                         <property name="xalign">0.5</property>
  89 +                         <property name="yalign">0.5</property>
  90 +                         <property name="xpad">0</property>
  91 +                         <property name="ypad">0</property>
  92 +                       </widget>
  93 +                     </child>
  94                     </widget>
  95                   </child>
  96                 </widget>
  97 @@ -81,7 +111,8 @@
  98           <child>
  99             <widget class="GtkMenuItem" id="edit1">
 100               <property name="visible">True</property>
 101 -             <property name="stock_item">GNOMEUIINFO_MENU_SETTINGS_TREE</property>
 102 +             <property name="label" translatable="yes">_Settings</property>
 103 +             <property name="use_underline">True</property>
 104
 105               <child>
 106                 <widget class="GtkMenu" id="edit1_menu">
 107 @@ -89,8 +120,21 @@
 108                   <child>
 109                     <widget class="GtkImageMenuItem" id="menu_preferences">
 110                       <property name="visible">True</property>
 111 -                     <property name="stock_item">GNOMEUIINFO_MENU_PREFERENCES_ITEM</property>
 112 +                     <property name="label" translatable="yes">Prefere_nces</property>
 113 +                     <property name="use_underline">True</property>
 114                       <signal name="activate" handler="on_preferences1_activate" last_modification_time="Thu, 29 May 2003 18:20:35 GMT"/>
 115 +
 116 +                     <child internal-child="image">
 117 +                       <widget class="GtkImage" id="image21">
 118 +                         <property name="visible">True</property>
 119 +                         <property name="stock">gtk-preferences</property>
 120 +                         <property name="icon_size">1</property>
 121 +                         <property name="xalign">0.5</property>
 122 +                         <property name="yalign">0.5</property>
 123 +                         <property name="xpad">0</property>
 124 +                         <property name="ypad">0</property>
 125 +                       </widget>
 126 +                     </child>
 127                     </widget>
 128                   </child>
 129                 </widget>
 130 @@ -101,15 +145,17 @@
 131           <child>
 132             <widget class="GtkMenuItem" id="help1">
 133               <property name="visible">True</property>
 134 -             <property name="stock_item">GNOMEUIINFO_MENU_HELP_TREE</property>
 135 +             <property name="label" translatable="yes">_Help</property>
 136 +             <property name="use_underline">True</property>
 137
 138               <child>
 139                 <widget class="GtkMenu" id="help1_menu">
 140
 141                   <child>
 142 -                   <widget class="GtkImageMenuItem" id="menu_about">
 143 +                   <widget class="GtkMenuItem" id="menu_about">
 144                       <property name="visible">True</property>
 145 -                     <property name="stock_item">GNOMEUIINFO_MENU_ABOUT_ITEM</property>
 146 +                     <property name="label" translatable="yes">A_bout</property>
 147 +                     <property name="use_underline">True</property>
 148                     </widget>
 149                   </child>
 150                 </widget>
 151 @@ -125,6 +171,79 @@
 152        </child>
 153
 154        <child>
 155 +       <widget class="GtkToolbar" id="toolbar1">
 156 +         <property name="visible">True</property>
 157 +         <property name="orientation">GTK_ORIENTATION_HORIZONTAL</property>
 158 +         <property name="toolbar_style">GTK_TOOLBAR_BOTH</property>
 159 +         <property name="tooltips">True</property>
 160 +         <property name="show_arrow">True</property>
 161 +
 162 +         <child>
 163 +           <widget class="GtkToolButton" id="button_connect">
 164 +             <property name="visible">True</property>
 165 +             <property name="label" translatable="yes">_Connect</property>
 166 +             <property name="use_underline">True</property>
 167 +             <property name="stock_id">gtk-yes</property>
 168 +             <property name="visible_horizontal">True</property>
 169 +             <property name="visible_vertical">True</property>
 170 +             <property name="is_important">True</property>
 171 +           </widget>
 172 +           <packing>
 173 +             <property name="expand">False</property>
 174 +             <property name="homogeneous">True</property>
 175 +           </packing>
 176 +         </child>
 177 +
 178 +         <child>
 179 +           <widget class="GtkToolButton" id="button_preferences">
 180 +             <property name="visible">True</property>
 181 +             <property name="stock_id">gtk-preferences</property>
 182 +             <property name="visible_horizontal">True</property>
 183 +             <property name="visible_vertical">True</property>
 184 +             <property name="is_important">False</property>
 185 +             <signal name="clicked" handler="on_preferences1_activate" last_modification_time="Thu, 14 Oct 2004 16:43:57 GMT"/>
 186 +           </widget>
 187 +           <packing>
 188 +             <property name="expand">False</property>
 189 +             <property name="homogeneous">True</property>
 190 +           </packing>
 191 +         </child>
 192 +
 193 +         <child>
 194 +           <widget class="GtkSeparatorToolItem" id="separatortoolitem1">
 195 +             <property name="visible">True</property>
 196 +             <property name="draw">True</property>
 197 +             <property name="visible_horizontal">True</property>
 198 +             <property name="visible_vertical">True</property>
 199 +           </widget>
 200 +           <packing>
 201 +             <property name="expand">False</property>
 202 +             <property name="homogeneous">False</property>
 203 +           </packing>
 204 +         </child>
 205 +
 206 +         <child>
 207 +           <widget class="GtkToolButton" id="button_quit">
 208 +             <property name="visible">True</property>
 209 +             <property name="stock_id">gtk-quit</property>
 210 +             <property name="visible_horizontal">True</property>
 211 +             <property name="visible_vertical">True</property>
 212 +             <property name="is_important">False</property>
 213 +           </widget>
 214 +           <packing>
 215 +             <property name="expand">False</property>
 216 +             <property name="homogeneous">True</property>
 217 +           </packing>
 218 +         </child>
 219 +       </widget>
 220 +       <packing>
 221 +         <property name="padding">0</property>
 222 +         <property name="expand">False</property>
 223 +         <property name="fill">False</property>
 224 +       </packing>
 225 +      </child>
 226 +
 227 +      <child>
 228         <widget class="GtkTable" id="main_table">
 229           <property name="visible">True</property>
 230           <property name="n_rows">5</property>
 231 @@ -138,84 +257,6 @@
 232               <property name="visible">True</property>
 233               <property name="layout_style">GTK_BUTTONBOX_DEFAULT_STYLE</property>
 234               <property name="spacing">0</property>
 235 -
 236 -             <child>
 237 -               <widget class="GtkButton" id="button2">
 238 -                 <property name="visible">True</property>
 239 -                 <property name="can_default">True</property>
 240 -                 <property name="can_focus">True</property>
 241 -                 <property name="label">gtk-help</property>
 242 -                 <property name="use_stock">True</property>
 243 -                 <property name="relief">GTK_RELIEF_NORMAL</property>
 244 -               </widget>
 245 -             </child>
 246 -
 247 -             <child>
 248 -               <widget class="GtkButton" id="button_connect">
 249 -                 <property name="visible">True</property>
 250 -                 <property name="can_default">True</property>
 251 -                 <property name="has_default">True</property>
 252 -                 <property name="can_focus">True</property>
 253 -                 <property name="has_focus">True</property>
 254 -                 <property name="relief">GTK_RELIEF_NORMAL</property>
 255 -
 256 -                 <child>
 257 -                   <widget class="GtkAlignment" id="alignment12">
 258 -                     <property name="visible">True</property>
 259 -                     <property name="xalign">0.5</property>
 260 -                     <property name="yalign">0.5</property>
 261 -                     <property name="xscale">0</property>
 262 -                     <property name="yscale">0</property>
 263 -
 264 -                     <child>
 265 -                       <widget class="GtkHBox" id="hbox13">
 266 -                         <property name="visible">True</property>
 267 -                         <property name="homogeneous">False</property>
 268 -                         <property name="spacing">0</property>
 269 -
 270 -                         <child>
 271 -                           <widget class="GtkImage" id="image8">
 272 -                             <property name="visible">True</property>
 273 -                             <property name="stock">gtk-yes</property>
 274 -                             <property name="icon_size">4</property>
 275 -                             <property name="xalign">0.5</property>
 276 -                             <property name="yalign">0.5</property>
 277 -                             <property name="xpad">0</property>
 278 -                             <property name="ypad">0</property>
 279 -                           </widget>
 280 -                           <packing>
 281 -                             <property name="padding">0</property>
 282 -                             <property name="expand">False</property>
 283 -                             <property name="fill">False</property>
 284 -                           </packing>
 285 -                         </child>
 286 -
 287 -                         <child>
 288 -                           <widget class="GtkLabel" id="label33">
 289 -                             <property name="visible">True</property>
 290 -                             <property name="label" translatable="yes">_Connect!</property>
 291 -                             <property name="use_underline">True</property>
 292 -                             <property name="use_markup">False</property>
 293 -                             <property name="justify">GTK_JUSTIFY_LEFT</property>
 294 -                             <property name="wrap">False</property>
 295 -                             <property name="selectable">False</property>
 296 -                             <property name="xalign">0.5</property>
 297 -                             <property name="yalign">0.5</property>
 298 -                             <property name="xpad">0</property>
 299 -                             <property name="ypad">0</property>
 300 -                           </widget>
 301 -                           <packing>
 302 -                             <property name="padding">0</property>
 303 -                             <property name="expand">False</property>
 304 -                             <property name="fill">False</property>
 305 -                           </packing>
 306 -                         </child>
 307 -                       </widget>
 308 -                     </child>
 309 -                   </widget>
 310 -                 </child>
 311 -               </widget>
 312 -             </child>
 313             </widget>
 314             <packing>
 315               <property name="left_attach">0</property>
 316 @@ -246,23 +287,11 @@
 317           </child>
 318
 319           <child>
 320 -           <widget class="GtkHSeparator" id="hseparator5">
 321 -             <property name="visible">True</property>
 322 -           </widget>
 323 -           <packing>
 324 -             <property name="left_attach">0</property>
 325 -             <property name="right_attach">5</property>
 326 -             <property name="top_attach">2</property>
 327 -             <property name="bottom_attach">4</property>
 328 -             <property name="y_padding">3</property>
 329 -             <property name="x_options">fill</property>
 330 -           </packing>
 331 -         </child>
 332 -
 333 -         <child>
 334             <widget class="GtkCombo" id="main_combo">
 335               <property name="width_request">240</property>
 336               <property name="visible">True</property>
 337 +             <property name="can_default">True</property>
 338 +             <property name="has_default">True</property>
 339               <property name="value_in_list">True</property>
 340               <property name="allow_empty">True</property>
 341               <property name="case_sensitive">False</property>
 342 @@ -335,12 +364,17 @@
 343  </widget>
 344
 345  <widget class="GtkWindow" id="details_window">
 346 -  <property name="title" translatable="yes">GkDial: Details</property>
 347 +  <property name="title" translatable="yes">Dialler: Details</property>
 348    <property name="type">GTK_WINDOW_TOPLEVEL</property>
 349    <property name="window_position">GTK_WIN_POS_CENTER</property>
 350    <property name="modal">False</property>
 351    <property name="resizable">False</property>
 352    <property name="destroy_with_parent">False</property>
 353 +  <property name="decorated">True</property>
 354 +  <property name="skip_taskbar_hint">False</property>
 355 +  <property name="skip_pager_hint">False</property>
 356 +  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
 357 +  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 358
 359    <child>
 360      <widget class="GtkVBox" id="vbox7">
 361 @@ -525,6 +559,7 @@
 362               <property name="visible">True</property>
 363               <property name="can_focus">True</property>
 364               <property name="relief">GTK_RELIEF_NORMAL</property>
 365 +             <property name="focus_on_click">True</property>
 366
 367               <child>
 368                 <widget class="GtkAlignment" id="alignment10">
 369 @@ -533,6 +568,10 @@
 370                   <property name="yalign">0.5</property>
 371                   <property name="xscale">0</property>
 372                   <property name="yscale">0</property>
 373 +                 <property name="top_padding">0</property>
 374 +                 <property name="bottom_padding">0</property>
 375 +                 <property name="left_padding">0</property>
 376 +                 <property name="right_padding">0</property>
 377
 378                   <child>
 379                     <widget class="GtkHBox" id="hbox12">
 380 @@ -632,12 +671,17 @@
 381  </widget>
 382
 383  <widget class="GtkWindow" id="prefs_window">
 384 -  <property name="title" translatable="yes">GkDial: Preferences</property>
 385 +  <property name="title" translatable="yes">Dialler: Preferences</property>
 386    <property name="type">GTK_WINDOW_TOPLEVEL</property>
 387    <property name="window_position">GTK_WIN_POS_CENTER</property>
 388    <property name="modal">True</property>
 389    <property name="resizable">True</property>
 390    <property name="destroy_with_parent">False</property>
 391 +  <property name="decorated">True</property>
 392 +  <property name="skip_taskbar_hint">False</property>
 393 +  <property name="skip_pager_hint">False</property>
 394 +  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
 395 +  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 396
 397    <child>
 398      <widget class="GtkVBox" id="vbox1">
 399 @@ -680,6 +724,7 @@
 400                       <property name="label">gtk-add</property>
 401                       <property name="use_stock">True</property>
 402                       <property name="relief">GTK_RELIEF_NORMAL</property>
 403 +                     <property name="focus_on_click">True</property>
 404                     </widget>
 405                   </child>
 406
 407 @@ -691,6 +736,7 @@
 408                       <property name="label">gtk-properties</property>
 409                       <property name="use_stock">True</property>
 410                       <property name="relief">GTK_RELIEF_NORMAL</property>
 411 +                     <property name="focus_on_click">True</property>
 412                     </widget>
 413                   </child>
 414
 415 @@ -702,6 +748,7 @@
 416                       <property name="label">gtk-remove</property>
 417                       <property name="use_stock">True</property>
 418                       <property name="relief">GTK_RELIEF_NORMAL</property>
 419 +                     <property name="focus_on_click">True</property>
 420                     </widget>
 421                   </child>
 422                 </widget>
 423 @@ -754,7 +801,7 @@
 424           <child>
 425             <widget class="GtkLabel" id="nb_accounts_page">
 426               <property name="visible">True</property>
 427 -             <property name="label" translatable="yes">A_ccounts</property>
 428 +             <property name="label" translatable="yes">Acco_unts</property>
 429               <property name="use_underline">True</property>
 430               <property name="use_markup">False</property>
 431               <property name="justify">GTK_JUSTIFY_LEFT</property>
 432 @@ -800,6 +847,7 @@
 433                           <property name="label" translatable="yes">_Retry if connection quits when dialing</property>
 434                           <property name="use_underline">True</property>
 435                           <property name="relief">GTK_RELIEF_NORMAL</property>
 436 +                         <property name="focus_on_click">True</property>
 437                           <property name="active">False</property>
 438                           <property name="inconsistent">False</property>
 439                           <property name="draw_indicator">True</property>
 440 @@ -821,6 +869,7 @@
 441                           <property name="label" translatable="yes">Reconnect if connection is lost</property>
 442                           <property name="use_underline">True</property>
 443                           <property name="relief">GTK_RELIEF_NORMAL</property>
 444 +                         <property name="focus_on_click">True</property>
 445                           <property name="active">False</property>
 446                           <property name="inconsistent">False</property>
 447                           <property name="draw_indicator">True</property>
 448 @@ -977,6 +1026,7 @@
 449                           <property name="label" translatable="yes">Main window is hidden when the program starts</property>
 450                           <property name="use_underline">True</property>
 451                           <property name="relief">GTK_RELIEF_NORMAL</property>
 452 +                         <property name="focus_on_click">True</property>
 453                           <property name="active">False</property>
 454                           <property name="inconsistent">False</property>
 455                           <property name="draw_indicator">True</property>
 456 @@ -995,9 +1045,10 @@
 457                           <property name="visible">True</property>
 458                           <property name="tooltip" translatable="yes">Hides main window when starting up (implies on Always show tray icon)</property>
 459                           <property name="can_focus">True</property>
 460 -                         <property name="label" translatable="yes">Exit GkDial when connection is closed</property>
 461 +                         <property name="label" translatable="yes">Exit Dialler when connection is closed</property>
 462                           <property name="use_underline">True</property>
 463                           <property name="relief">GTK_RELIEF_NORMAL</property>
 464 +                         <property name="focus_on_click">True</property>
 465                           <property name="active">False</property>
 466                           <property name="inconsistent">False</property>
 467                           <property name="draw_indicator">True</property>
 468 @@ -1053,6 +1104,7 @@
 469                       <property name="label" translatable="yes">Hide details window when connection is accomplished</property>
 470                       <property name="use_underline">True</property>
 471                       <property name="relief">GTK_RELIEF_NORMAL</property>
 472 +                     <property name="focus_on_click">True</property>
 473                       <property name="active">False</property>
 474                       <property name="inconsistent">False</property>
 475                       <property name="draw_indicator">True</property>
 476 @@ -1110,6 +1162,7 @@
 477                           <property name="label" translatable="yes">Always show tray icon</property>
 478                           <property name="use_underline">True</property>
 479                           <property name="relief">GTK_RELIEF_NORMAL</property>
 480 +                         <property name="focus_on_click">True</property>
 481                           <property name="active">False</property>
 482                           <property name="inconsistent">False</property>
 483                           <property name="draw_indicator">True</property>
 484 @@ -1160,8 +1213,8 @@
 485           <child>
 486             <widget class="GtkLabel" id="nb_interface_page">
 487               <property name="visible">True</property>
 488 -             <property name="label" translatable="yes">Interface</property>
 489 -             <property name="use_underline">False</property>
 490 +             <property name="label" translatable="yes">_Interface</property>
 491 +             <property name="use_underline">True</property>
 492               <property name="use_markup">False</property>
 493               <property name="justify">GTK_JUSTIFY_LEFT</property>
 494               <property name="wrap">False</property>
 495 @@ -1201,6 +1254,10 @@
 496           <property name="yalign">0.5</property>
 497           <property name="xscale">0.03</property>
 498           <property name="yscale">1</property>
 499 +         <property name="top_padding">0</property>
 500 +         <property name="bottom_padding">0</property>
 501 +         <property name="left_padding">0</property>
 502 +         <property name="right_padding">0</property>
 503
 504           <child>
 505             <widget class="GtkButton" id="button_prefs_close">
 506 @@ -1210,6 +1267,7 @@
 507               <property name="label">gtk-close</property>
 508               <property name="use_stock">True</property>
 509               <property name="relief">GTK_RELIEF_NORMAL</property>
 510 +             <property name="focus_on_click">True</property>
 511             </widget>
 512           </child>
 513         </widget>
 514 @@ -1224,12 +1282,17 @@
 515  </widget>
 516
 517  <widget class="GtkWindow" id="connedit_window">
 518 -  <property name="title" translatable="yes">Conection Properties</property>
 519 +  <property name="title" translatable="yes">Connection Properties</property>
 520    <property name="type">GTK_WINDOW_TOPLEVEL</property>
 521    <property name="window_position">GTK_WIN_POS_CENTER</property>
 522    <property name="modal">True</property>
 523    <property name="resizable">True</property>
 524    <property name="destroy_with_parent">False</property>
 525 +  <property name="decorated">True</property>
 526 +  <property name="skip_taskbar_hint">False</property>
 527 +  <property name="skip_pager_hint">False</property>
 528 +  <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
 529 +  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
 530
 531    <child>
 532      <widget class="GtkVBox" id="vbox3">
 533 @@ -1578,6 +1641,176 @@
 534               <property name="type">tab</property>
 535             </packing>
 536           </child>
 537 +
 538 +         <child>
 539 +           <widget class="GtkTable" id="table7">
 540 +             <property name="border_width">12</property>
 541 +             <property name="visible">True</property>
 542 +             <property name="n_rows">3</property>
 543 +             <property name="n_columns">2</property>
 544 +             <property name="homogeneous">False</property>
 545 +             <property name="row_spacing">8</property>
 546 +             <property name="column_spacing">5</property>
 547 +
 548 +             <child>
 549 +               <widget class="GtkLabel" id="label38">
 550 +                 <property name="visible">True</property>
 551 +                 <property name="label" translatable="yes">Modem init string:</property>
 552 +                 <property name="use_underline">False</property>
 553 +                 <property name="use_markup">False</property>
 554 +                 <property name="justify">GTK_JUSTIFY_LEFT</property>
 555 +                 <property name="wrap">False</property>
 556 +                 <property name="selectable">False</property>
 557 +                 <property name="xalign">0</property>
 558 +                 <property name="yalign">0.5</property>
 559 +                 <property name="xpad">0</property>
 560 +                 <property name="ypad">0</property>
 561 +               </widget>
 562 +               <packing>
 563 +                 <property name="left_attach">0</property>
 564 +                 <property name="right_attach">1</property>
 565 +                 <property name="top_attach">0</property>
 566 +                 <property name="bottom_attach">1</property>
 567 +                 <property name="x_options">fill</property>
 568 +                 <property name="y_options"></property>
 569 +               </packing>
 570 +             </child>
 571 +
 572 +             <child>
 573 +               <widget class="GtkEntry" id="cp_entry_modeminit">
 574 +                 <property name="visible">True</property>
 575 +                 <property name="can_focus">True</property>
 576 +                 <property name="editable">True</property>
 577 +                 <property name="visibility">True</property>
 578 +                 <property name="max_length">220</property>
 579 +                 <property name="text" translatable="yes"></property>
 580 +                 <property name="has_frame">True</property>
 581 +                 <property name="invisible_char" translatable="yes">*</property>
 582 +                 <property name="activates_default">False</property>
 583 +               </widget>
 584 +               <packing>
 585 +                 <property name="left_attach">1</property>
 586 +                 <property name="right_attach">2</property>
 587 +                 <property name="top_attach">0</property>
 588 +                 <property name="bottom_attach">1</property>
 589 +                 <property name="y_options"></property>
 590 +               </packing>
 591 +             </child>
 592 +
 593 +             <child>
 594 +               <widget class="GtkLabel" id="label39">
 595 +                 <property name="visible">True</property>
 596 +                 <property name="label" translatable="yes">Additional options:</property>
 597 +                 <property name="use_underline">False</property>
 598 +                 <property name="use_markup">False</property>
 599 +                 <property name="justify">GTK_JUSTIFY_LEFT</property>
 600 +                 <property name="wrap">False</property>
 601 +                 <property name="selectable">False</property>
 602 +                 <property name="xalign">0</property>
 603 +                 <property name="yalign">0.5</property>
 604 +                 <property name="xpad">0</property>
 605 +                 <property name="ypad">0</property>
 606 +               </widget>
 607 +               <packing>
 608 +                 <property name="left_attach">0</property>
 609 +                 <property name="right_attach">1</property>
 610 +                 <property name="top_attach">1</property>
 611 +                 <property name="bottom_attach">2</property>
 612 +                 <property name="x_options">fill</property>
 613 +                 <property name="y_options"></property>
 614 +               </packing>
 615 +             </child>
 616 +
 617 +             <child>
 618 +               <widget class="GtkEntry" id="cp_entry_option1">
 619 +                 <property name="visible">True</property>
 620 +                 <property name="can_focus">True</property>
 621 +                 <property name="editable">True</property>
 622 +                 <property name="visibility">True</property>
 623 +                 <property name="max_length">220</property>
 624 +                 <property name="text" translatable="yes"></property>
 625 +                 <property name="has_frame">True</property>
 626 +                 <property name="invisible_char" translatable="yes">*</property>
 627 +                 <property name="activates_default">False</property>
 628 +               </widget>
 629 +               <packing>
 630 +                 <property name="left_attach">1</property>
 631 +                 <property name="right_attach">2</property>
 632 +                 <property name="top_attach">1</property>
 633 +                 <property name="bottom_attach">2</property>
 634 +                 <property name="y_options"></property>
 635 +               </packing>
 636 +             </child>
 637 +
 638 +             <child>
 639 +               <widget class="GtkLabel" id="label40">
 640 +                 <property name="visible">True</property>
 641 +                 <property name="label" translatable="yes">Additional options (cont.):</property>
 642 +                 <property name="use_underline">False</property>
 643 +                 <property name="use_markup">False</property>
 644 +                 <property name="justify">GTK_JUSTIFY_LEFT</property>
 645 +                 <property name="wrap">False</property>
 646 +                 <property name="selectable">False</property>
 647 +                 <property name="xalign">0</property>
 648 +                 <property name="yalign">0.5</property>
 649 +                 <property name="xpad">0</property>
 650 +                 <property name="ypad">0</property>
 651 +               </widget>
 652 +               <packing>
 653 +                 <property name="left_attach">0</property>
 654 +                 <property name="right_attach">1</property>
 655 +                 <property name="top_attach">2</property>
 656 +                 <property name="bottom_attach">3</property>
 657 +                 <property name="x_options">fill</property>
 658 +                 <property name="y_options"></property>
 659 +               </packing>
 660 +             </child>
 661 +
 662 +             <child>
 663 +               <widget class="GtkEntry" id="cp_entry_option2">
 664 +                 <property name="visible">True</property>
 665 +                 <property name="can_focus">True</property>
 666 +                 <property name="editable">True</property>
 667 +                 <property name="visibility">True</property>
 668 +                 <property name="max_length">220</property>
 669 +                 <property name="text" translatable="yes"></property>
 670 +                 <property name="has_frame">True</property>
 671 +                 <property name="invisible_char" translatable="yes">*</property>
 672 +                 <property name="activates_default">False</property>
 673 +               </widget>
 674 +               <packing>
 675 +                 <property name="left_attach">1</property>
 676 +                 <property name="right_attach">2</property>
 677 +                 <property name="top_attach">2</property>
 678 +                 <property name="bottom_attach">3</property>
 679 +                 <property name="y_options"></property>
 680 +               </packing>
 681 +             </child>
 682 +           </widget>
 683 +           <packing>
 684 +             <property name="tab_expand">False</property>
 685 +             <property name="tab_fill">True</property>
 686 +           </packing>
 687 +         </child>
 688 +
 689 +         <child>
 690 +           <widget class="GtkLabel" id="label37">
 691 +             <property name="visible">True</property>
 692 +             <property name="label" translatable="yes">Ad_vanced</property>
 693 +             <property name="use_underline">True</property>
 694 +             <property name="use_markup">False</property>
 695 +             <property name="justify">GTK_JUSTIFY_LEFT</property>
 696 +             <property name="wrap">False</property>
 697 +             <property name="selectable">False</property>
 698 +             <property name="xalign">0.5</property>
 699 +             <property name="yalign">0.5</property>
 700 +             <property name="xpad">0</property>
 701 +             <property name="ypad">0</property>
 702 +           </widget>
 703 +           <packing>
 704 +             <property name="type">tab</property>
 705 +           </packing>
 706 +         </child>
 707         </widget>
 708         <packing>
 709           <property name="padding">0</property>
 710 @@ -1605,6 +1838,10 @@
 711           <property name="yalign">0.5</property>
 712           <property name="xscale">0.03</property>
 713           <property name="yscale">1</property>
 714 +         <property name="top_padding">0</property>
 715 +         <property name="bottom_padding">0</property>
 716 +         <property name="left_padding">0</property>
 717 +         <property name="right_padding">0</property>
 718
 719           <child>
 720             <widget class="GtkHButtonBox" id="hbuttonbox1">
 721 @@ -1620,6 +1857,7 @@
 722                   <property name="label">gtk-cancel</property>
 723                   <property name="use_stock">True</property>
 724                   <property name="relief">GTK_RELIEF_NORMAL</property>
 725 +                 <property name="focus_on_click">True</property>
 726                 </widget>
 727               </child>
 728
 729 @@ -1631,6 +1869,7 @@
 730                   <property name="label">gtk-save</property>
 731                   <property name="use_stock">True</property>
 732                   <property name="relief">GTK_RELIEF_NORMAL</property>
 733 +                 <property name="focus_on_click">True</property>
 734                 </widget>
 735               </child>
 736             </widget>
 737 diff -Nur gkdial-1.8.1.orig/gkdial.schemas gkdial-1.8.1/gkdial.schemas
 738 --- gkdial-1.8.1.orig/gkdial.schemas    1970-01-01 01:00:00.000000000 +0100
 739 +++ gkdial-1.8.1/gkdial.schemas 2004-09-08 14:47:48.000000000 +0200
 740 @@ -0,0 +1,30 @@
 741 +<gconfschemafile>
 742 +    <schemalist>
 743 +
 744 +      <schema>
 745 +        <key>/schemas/apps/gkdial/preferences/hide_dw_on_conn</key>
 746 +        <applyto>/apps/gkdial/preferences/hide_dw_on_conn</applyto>
 747 +        <owner>gkdial</owner>
 748 +        <type>bool</type>
 749 +        <default>true</default>
 750 +        <locale name="C">
 751 +          <short>Behaviour of detail window.</short>
 752 +          <long>Hide the detail window after a connection is established.</long>
 753 +        </locale>
 754 +      </schema>
 755 +
 756 +      <schema>
 757 +        <key>/schemas/apps/gkdial/preferences/always_tray</key>
 758 +        <applyto>/apps/gkdial/preferences/always_tray</applyto>
 759 +        <owner>gkdial</owner>
 760 +        <type>bool</type>
 761 +        <default>true</default>
 762 +        <locale name="C">
 763 +          <short>Behaviour of tray icon.</short>
 764 +          <long>Show tray icon only if necessary or always.</long>
 765 +        </locale>
 766 +      </schema>
 767 +
 768 +    </schemalist>
 769 +
 770 +</gconfschemafile>
 771 diff -Nur gkdial-1.8.1.orig/src/connedit.c gkdial-1.8.1/src/connedit.c
 772 --- gkdial-1.8.1.orig/src/connedit.c    2003-06-27 01:14:51.000000000 +0200
 773 +++ gkdial-1.8.1/src/connedit.c 2004-10-16 11:30:29.000000000 +0200
 774 @@ -1,7 +1,9 @@
 775  #include <stdio.h>
 776  #include <stdlib.h>
 777  #include <string.h>
 778 -
 779 +#include <sys/types.h>
 780 +#include <sys/stat.h>
 781 +
 782  #ifdef HAVE_CONFIG_H
 783  #  include <config.h>
 784  #endif
 785 @@ -41,26 +43,45 @@
 786    file_name = g_strdup_printf ("/etc/ppp/peers/%s", connection->name);
 787    file = fopen (file_name, "r");
 788    g_free (file_name);
 789 -
 790 -  while (!feof (file))
 791 +
 792 +  if (file)
 793      {
 794 -      fgets (buf, 255, file);
 795 -
 796 -      /*
 797 -       * gets the user name
 798 -       */
 799 -      if (!strncmp ("user ", buf, 5))
 800 -       {
 801 -         gchar *tmp;
 802 -
 803 -         g_strstrip (buf);
 804 -         tmp = strstr (buf, " ");
 805 -         gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_user), tmp + 1);
 806 -       }
 807 +      gint parseoptions = 0;
 808 +      while (!feof (file))
 809 +        {
 810 +          fgets (buf, 255, file);
 811 +
 812 +          /*
 813 +           * gets the user name
 814 +           */
 815 +          if (!strncmp ("user ", buf, 5))
 816 +            {
 817 +              gchar *tmp;
 818 +
 819 +              g_strstrip (buf);
 820 +              tmp = strstr (buf, " ");
 821 +              gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_user), tmp + 1);
 822 +            }
 823 +
 824 +          if (parseoptions)
 825 +            {
 826 +              g_strstrip (buf);
 827 +              if (parseoptions == 1)
 828 +                gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_option1), buf);
 829 +              if (parseoptions == 2)
 830 +                gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_option2), buf);
 831 +              parseoptions++;
 832 +            }
 833 +
 834 +          if (!strncmp ("remotename ", buf, 11))
 835 +            {
 836 +              memset(buf, 0, 255);
 837 +              parseoptions++;
 838 +            }
 839 +        }
 840 +
 841 +      fclose (file);
 842      }
 843 -
 844 -  fclose (file);
 845 -
 846  #ifdef DEBUG
 847    fprintf (stderr, "Reading /etc/chatscripts/%s\n", connection->name);
 848  #endif
 849 @@ -72,31 +93,46 @@
 850    file_name = g_strdup_printf ("/etc/chatscripts/%s", connection->name);
 851    file = fopen (file_name, "r");
 852    g_free (file_name);
 853 -
 854 -  while (!feof (file))
 855 +  if (file)
 856      {
 857 -      fgets (buf, 255, file);
 858 -
 859 -      if (!strncmp ("# ispauth", buf, 9))
 860 -       {                       /* gets the auth style */
 861 -         g_strstrip (buf);
 862 -         tmp = strstr (buf, "auth");
 863 -         gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_auth), tmp + 5);
 864 -         tmp = NULL;
 865 -       }
 866 -      else if (!strncmp ("# ispnumber", buf, 11))
 867 -       {                       /* gets the phone
 868 -                                * number */
 869 -         fgets (buf, 255, file);
 870 -         g_strstrip (buf);
 871 -         tmp = strstr (buf, "ATD");
 872 -         gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_phone), tmp + 4);
 873 -         tmp = NULL;
 874 -       }
 875 +      while (!feof (file))
 876 +        {
 877 +          fgets (buf, 255, file);
 878 +
 879 +          if (!strncmp ("# ispauth", buf, 9))
 880 +        {                      /* gets the auth style */
 881 +          g_strstrip (buf);
 882 +          tmp = strstr (buf, "auth");
 883 +          gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_auth), tmp + 5);
 884 +          tmp = NULL;
 885 +        }
 886 +          else if (!strncmp ("# modeminit", buf, 11))
 887 +        {                      /* gets the modem init string */
 888 +          fgets (buf, 255, file);
 889 +          g_strstrip (buf);
 890 +          tmp = strstr (buf, "''");
 891 +          if (!strstr(tmp + 2,"'ATZ'")) /* get value, remove "'" */
 892 +          {
 893 +            gchar *t = strstr(tmp + 4, "'");
 894 +            if (t)
 895 +                t[0] = 0;
 896 +            gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_modeminit), tmp + 4);
 897 +          }
 898 +          tmp = NULL;
 899 +        }
 900 +          else if (!strncmp ("# ispnumber", buf, 11))
 901 +        {                      /* gets the phone
 902 +                     * number */
 903 +          fgets (buf, 255, file);
 904 +          g_strstrip (buf);
 905 +          tmp = strstr (buf, "ATD");
 906 +          gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_phone), tmp + 4);
 907 +          tmp = NULL;
 908 +        }
 909 +        }
 910 +
 911 +      fclose (file);
 912      }
 913 -
 914 -  fclose (file);
 915 -
 916    /*
 917     * parses /etc/ppp/${auth_type}-secrets, to get password
 918     */
 919 @@ -105,9 +141,8 @@
 920
 921      if (!connection->auth_type)
 922        {
 923 -       connection->auth_type =
 924 -         gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_auth),
 925 -                                 0, -1);
 926 +        connection->auth_type =
 927 +        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_auth), 0, -1);
 928        }
 929
 930      if (!strcmp (connection->auth_type, "PAP"))
 931 @@ -124,7 +159,7 @@
 932  #endif
 933    file = fopen (file_name, "r");
 934    g_free (file_name);
 935 -
 936 +  if (file)
 937    {
 938      gchar *search_for;
 939
 940 @@ -169,8 +204,8 @@
 941             break;
 942           }
 943        }
 944 +    fclose (file);
 945    }
 946 -  fclose (file);
 947    g_free (buf);
 948
 949    return TRUE;
 950 @@ -189,6 +224,12 @@
 951    connection->password = NULL;
 952    g_free (connection->auth_type);
 953    connection->auth_type = NULL;
 954 +  g_free (connection->modeminit);
 955 +  connection->modeminit = NULL;
 956 +  g_free (connection->option1);
 957 +  connection->option1 = NULL;
 958 +  g_free (connection->option2);
 959 +  connection->option2 = NULL;
 960  }
 961
 962  void
 963 @@ -201,6 +242,9 @@
 964    destination->user = g_strdup (source->user);
 965    destination->password = g_strdup (source->password);
 966    destination->auth_type = g_strdup (source->auth_type);
 967 +  destination->modeminit = g_strdup (source->modeminit);
 968 +  destination->option1 = g_strdup (source->option1);
 969 +  destination->option2 = g_strdup (source->option2);
 970  }
 971
 972  void
 973 @@ -212,6 +256,7 @@
 974    gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_phone), "");
 975    gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_user), "");
 976    gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_password), "");
 977 +  gtk_entry_set_text (GTK_ENTRY (gkdial->cp_entry_modeminit), "");
 978
 979    gkconnection_clear (connection);
 980  }
 981 @@ -617,21 +662,27 @@
 982        g_free (file_name);
 983        return;
 984      }
 985 -  g_free (file_name);
 986    /*
 987     * FIXME: need to get the modem device from somewhere
 988     */
 989 -  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
 990 -                                                                                                                                                                                        * file
 991 -                                                                                                                                                                                        */
 992 -          "115200\n" "defaultroute\n" "noipdefault\n" "user %s\n"      /* user
 993 -                                                                        * name
 994 -                                                                        */
 995 -          "remotename %s\n",   /* conn_name */
 996 -          PACKAGE, VERSION, connection->name, "/dev/modem",
 997 -          connection->user, connection->name);
 998 +  fprintf (file, "# This optionfile was generated by %s %s.\n" "# \n" "#\n"
 999 +                 "hide-password \n" "noauth\n"
1000 +                 "connect \"/usr/sbin/chat -v -f /etc/chatscripts/%s\"\n"
1001 +                 "debug\n" "%s\n"      /* modem file */
1002 +                    "115200\n" "defaultroute\n"
1003 +                 "noipdefault\n" "user %s\n"   /* user name */
1004 +                    "remotename %s\n", /* conn_name */
1005 +                 PACKAGE, VERSION, connection->name, "/dev/modem",
1006 +                    connection->user, connection->name);
1007 +  if (connection->option1)
1008 +      fprintf(file, "%s\n", connection->option1);
1009 +  if (connection->option2)
1010 +      fprintf(file, "%s\n", connection->option2);
1011    fclose (file);
1012 +  if (chmod (file_name, S_IWUSR | S_IRGRP | S_IRUSR | S_IROTH))
1013 +         perror("err");
1014
1015 +  g_free (file_name);
1016    /*
1017     * writes /etc/chatscripts/${peer}
1018     */
1019 @@ -646,16 +697,15 @@
1020        g_free (file_name);
1021        return;
1022      }
1023 -  g_free (file_name);
1024    /*
1025     * FIXME: need to get the modem device from somewhere
1026     */
1027 -  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
1028 -                                                                                                                                                                        */
1029 -          "# 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!
1030 -                                                                                                                                                                        */
1031 -          "# ispnumber\n" "OK-AT-OK ATDT%s\n"  /* phone - FIXME! Tone or
1032 -                                                * Pulse */
1033 +  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"
1034 +          "# ispauth %s\n"     /* auth  */
1035 +          "# abortstring\n" "ABORT BUSY ABORT 'NO CARRIER' ABORT VOICE ABORT 'NO DIALTONE'" "ABORT 'NO DIAL TONE' ABORT 'NO ANSWER'\n"
1036 +          "# modeminit\n" "'' '%s'\n"  /* FIXME! */
1037 +       "TIMEOUT 120\n"
1038 +          "# ispnumber\n" "OK-AT-OK ATDT%s\n"  /* phone - FIXME! Tone or Pulse */
1039            "# ispconnect\n"
1040            "CONNECT \\d\\c\n"
1041            "# prelogin\n"
1042 @@ -665,8 +715,12 @@
1043            "# postlogin\n"
1044            "\n"
1045            "# end of pppconfig stuff\n",
1046 -          PACKAGE, VERSION, connection->auth_type, connection->phone);
1047 +          PACKAGE, VERSION, connection->auth_type, connection->modeminit ? connection->modeminit : "ATZ", connection->phone);
1048 +
1049    fclose (file);
1050 +  if (chmod (file_name, S_IWUSR | S_IRGRP | S_IRUSR | S_IROTH))
1051 +         perror("err");
1052 +  g_free (file_name);
1053
1054    /*
1055     * remove the old user/pass entry before adding the new
1056 @@ -684,7 +738,7 @@
1057     * writes /etc/ppp/${auth}-secrets
1058     */
1059    {
1060 -    gchar *secrets_name;
1061 +    gchar *secrets_name = NULL;
1062
1063      if (!strcmp (connection->auth_type, "PAP"))
1064        secrets_name = g_strdup ("pap");
1065 @@ -743,7 +797,7 @@
1066         gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_conn_name),
1067                                 0, -1);
1068        if (!strcmp (tmp, ""))
1069 -       g_free (tmp);
1070 +        g_free (tmp);
1071        else
1072         {
1073           g_free (connection->name);
1074 @@ -759,7 +813,7 @@
1075      {
1076        g_free (connection->phone);
1077        connection->phone =
1078 -       gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_phone), 0, -1);
1079 +        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_phone), 0, -1);
1080      }
1081    else if (!strcmp (entry_name, "user"))
1082      {
1083 @@ -780,4 +834,22 @@
1084        connection->auth_type =
1085         gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_auth), 0, -1);
1086      }
1087 +  else if (!strcmp (entry_name, "modeminit"))
1088 +    {
1089 +      g_free (connection->modeminit);
1090 +      connection->modeminit =
1091 +        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_modeminit), 0, -1);
1092 +    }
1093 +  else if (!strcmp (entry_name, "option1"))
1094 +    {
1095 +      g_free (connection->option1);
1096 +      connection->option1 =
1097 +        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_option1), 0, -1);
1098 +    }
1099 +  else if (!strcmp (entry_name, "option2"))
1100 +    {
1101 +      g_free (connection->option2);
1102 +      connection->option2 =
1103 +        gtk_editable_get_chars (GTK_EDITABLE (gkdial->cp_entry_option2), 0, -1);
1104 +    }
1105  }
1106 diff -Nur gkdial-1.8.1.orig/src/defines.h gkdial-1.8.1/src/defines.h
1107 --- gkdial-1.8.1.orig/src/defines.h     2003-06-27 01:14:51.000000000 +0200
1108 +++ gkdial-1.8.1/src/defines.h  2004-09-29 14:59:38.000000000 +0200
1109 @@ -51,6 +51,6 @@
1110  #define CHK_TIMEOUT 1000       /* check_connection */
1111  #define CNT_TIMEOUT 47000      /* connecting_check */
1112
1113 -#define DEBUG 1
1114 +#define DEBUG 0
1115
1116  #endif
1117 diff -Nur gkdial-1.8.1.orig/src/details.c gkdial-1.8.1/src/details.c
1118 --- gkdial-1.8.1.orig/src/details.c     2003-06-27 01:14:51.000000000 +0200
1119 +++ gkdial-1.8.1/src/details.c  2004-10-16 11:30:29.000000000 +0200
1120 @@ -40,10 +40,11 @@
1121        gtk_widget_destroy (dialog);
1122
1123        if (response == GTK_RESPONSE_YES)
1124 -       gk_disconnect (NULL, gkdial);
1125 +      {
1126 +          gk_disconnect (NULL, gkdial);
1127 +          gk_status_set_disconnected(gkdial);
1128 +      }
1129      }
1130 -
1131 -  gtk_main_quit ();
1132  }
1133
1134  void
1135 diff -Nur gkdial-1.8.1.orig/src/gkdial.h gkdial-1.8.1/src/gkdial.h
1136 --- gkdial-1.8.1.orig/src/gkdial.h      2003-06-27 04:34:21.000000000 +0200
1137 +++ gkdial-1.8.1/src/gkdial.h   2004-10-14 18:55:22.000000000 +0200
1138 @@ -32,6 +32,8 @@
1139    gchar *password;
1140
1141    gchar *auth_type;
1142 +  gchar *modeminit;
1143 +  gchar *option1, *option2;
1144  };
1145
1146  typedef struct _GkDial GkDial;
1147 @@ -80,6 +82,8 @@
1148     */
1149    GtkWidget *button_connect;
1150    GtkWidget *button_disconnect;
1151 +  GtkWidget *button_quit;
1152 +  GtkWidget *button_preferences;
1153
1154    /*
1155     * misc buttons
1156 @@ -166,6 +170,9 @@
1157    GtkWidget *cp_entry_user;
1158    GtkWidget *cp_entry_password;
1159    GtkWidget *cp_entry_auth;
1160 +  GtkWidget *cp_entry_modeminit;
1161 +  GtkWidget *cp_entry_option1;
1162 +  GtkWidget *cp_entry_option2;
1163
1164    gint editing_status;
1165
1166 diff -Nur gkdial-1.8.1.orig/src/main.c gkdial-1.8.1/src/main.c
1167 --- gkdial-1.8.1.orig/src/main.c        2003-06-27 04:47:54.000000000 +0200
1168 +++ gkdial-1.8.1/src/main.c     2004-10-16 11:30:29.000000000 +0200
1169 @@ -38,10 +38,11 @@
1170  void
1171  gkdial_show_about (GtkWidget * widget, gpointer data)
1172  {
1173 -  gchar *translator_credits = g_strdup (_("translator_credits"));
1174 +  gchar *translator_credits =
1175 +       g_strdup (_("Adapted to GPE by Florian Boor <florian@kernelconcepts.de>"));
1176
1177    gk_dialog (GTK_MESSAGE_INFO,
1178 -            _("GkDial %s\n\n"
1179 +            _("Internet Dialler (GkDial) %s\n\n"
1180                "A PPP setup and dialing tool for GNOME.\n\n"
1181                "Author:\n\n"
1182                "\tGustavo Noronha Silva <kov@debian.org>\n\n"
1183 @@ -52,6 +53,7 @@
1184    g_free (translator_credits);
1185  }
1186
1187 +
1188  int
1189  gkdial_defaults_init (GkDial * gkdial)
1190  {
1191 @@ -101,7 +103,7 @@
1192    /*
1193     * GUI stuff
1194     */
1195 -  gkdial->main_window = glade_xml_get_widget (gkdial->gui, "main_window");
1196 +  gkdial->main_window = glade_xml_get_widget (gkdial->gui, "gk_main_window");
1197    gkdial->main_combo = glade_xml_get_widget (gkdial->gui, "main_combo");
1198
1199    gkdial->menu_new = glade_xml_get_widget (gkdial->gui, "menu_new");
1200 @@ -121,6 +123,10 @@
1201                                                  "button_connect");
1202    gkdial->button_disconnect = glade_xml_get_widget (gkdial->gui,
1203                                                     "button_disconnect");
1204 +  gkdial->button_quit = glade_xml_get_widget (gkdial->gui,
1205 +                                                   "button_quit");
1206 +  gkdial->button_preferences = glade_xml_get_widget (gkdial->gui,
1207 +                                                   "button_preferences");
1208
1209    gkdial->label_set_time = glade_xml_get_widget (gkdial->gui,
1210                                                  "label_set_time");
1211 @@ -208,6 +214,12 @@
1212                      "name", "password");
1213    gkdial->cp_entry_auth = glade_xml_get_widget (gkdial->gui, "cp_entry_auth");
1214    g_object_set_data (G_OBJECT (gkdial->cp_entry_auth), "name", "auth");
1215 +  gkdial->cp_entry_modeminit = glade_xml_get_widget (gkdial->gui, "cp_entry_modeminit");
1216 +  g_object_set_data (G_OBJECT (gkdial->cp_entry_modeminit), "name", "modeminit");
1217 +  gkdial->cp_entry_option1 = glade_xml_get_widget (gkdial->gui, "cp_entry_option1");
1218 +  g_object_set_data (G_OBJECT (gkdial->cp_entry_option1), "name", "option1");
1219 +  gkdial->cp_entry_option2 = glade_xml_get_widget (gkdial->gui, "cp_entry_option2");
1220 +  g_object_set_data (G_OBJECT (gkdial->cp_entry_option2), "name", "option2");
1221
1222    /*
1223     * GkConnection
1224 @@ -222,6 +234,9 @@
1225      conn->user = NULL;
1226      conn->password = NULL;
1227      conn->auth_type = NULL;
1228 +    conn->modeminit = NULL;
1229 +    conn->option1 = NULL;
1230 +    conn->option2 = NULL;
1231    }
1232    nullify_connection (gkdial->connection);
1233    nullify_connection (gkdial->connection_backup);
1234 @@ -312,26 +327,30 @@
1235    g_signal_connect (G_OBJECT (gkdial->menu_quit), "activate",
1236                     G_CALLBACK (gtk_main_quit), NULL);
1237
1238 -  /*
1239 -   * FIXME!: needs to select the connection on the peers_list, based on
1240 -   * the combo selection
1241 -   *
1242 -   * g_signal_connect (G_OBJECT(gkdial->menu_properties), "activate",
1243 -   * G_CALLBACK(gkdial_connedit_menu_show), gkdial);
1244 -   */
1245 +  g_signal_connect (G_OBJECT(gkdial->menu_properties), "activate",
1246 +            G_CALLBACK(gkdial_connedit_show), gkdial);
1247 +
1248    g_signal_connect (G_OBJECT (gkdial->menu_preferences), "activate",
1249                     G_CALLBACK (gkdial_prefs_show), gkdial);
1250
1251    g_signal_connect (G_OBJECT (gkdial->menu_about), "activate",
1252                     G_CALLBACK (gkdial_show_about), gkdial);
1253
1254 -  /*
1255 +  g_signal_connect_after (G_OBJECT (GTK_COMBO(gkdial->main_combo)->entry),
1256 +            "changed", G_CALLBACK (gkdial_main_select_peer), gkdial);
1257 +
1258 +  g_signal_connect (G_OBJECT (gkdial->button_quit), "clicked",
1259 +                   G_CALLBACK (gtk_main_quit), NULL);
1260 +
1261 +  g_signal_connect (G_OBJECT (gkdial->button_preferences), "clicked",
1262 +                   G_CALLBACK (gkdial_prefs_show), gkdial);
1263 + /*
1264     * connection handling buttons
1265     */
1266    g_signal_connect (G_OBJECT (gkdial->button_connect), "clicked",
1267                     G_CALLBACK (gk_connect), gkdial);
1268    g_signal_connect (G_OBJECT (gkdial->button_disconnect), "clicked",
1269 -                   G_CALLBACK (gk_disconnect), gkdial);
1270 +                   G_CALLBACK (gkdial_details_close), gkdial);
1271
1272    /*
1273     * details window
1274 @@ -382,6 +401,12 @@
1275                     G_CALLBACK (cp_entry_changed_cb), gkdial);
1276    g_signal_connect (G_OBJECT (gkdial->cp_entry_auth), "changed",
1277                     G_CALLBACK (cp_entry_changed_cb), gkdial);
1278 +  g_signal_connect (G_OBJECT (gkdial->cp_entry_modeminit), "changed",
1279 +                   G_CALLBACK (cp_entry_changed_cb), gkdial);
1280 +  g_signal_connect (G_OBJECT (gkdial->cp_entry_option1), "changed",
1281 +                   G_CALLBACK (cp_entry_changed_cb), gkdial);
1282 +  g_signal_connect (G_OBJECT (gkdial->cp_entry_option2), "changed",
1283 +                   G_CALLBACK (cp_entry_changed_cb), gkdial);
1284
1285    /*
1286     * general
1287 @@ -416,7 +441,7 @@
1288    gkdial.add_only = FALSE;
1289    gkdial.edit_only = FALSE;
1290    gkdial.remove_only = FALSE;
1291 -  char c;
1292 +  int c;
1293
1294    /*
1295     * it seems like poff kills gkdial together with it's children, so
1296 @@ -508,7 +533,11 @@
1297    gkdial_tray_init (&gkdial);
1298
1299    if (!gkdial.mw_starts_hiden && !GTK_WIDGET_VISIBLE (gkdial.main_window))
1300 -    gtk_widget_show (gkdial.main_window);
1301 +    {
1302 +      gtk_widget_show (gkdial.main_window);
1303 +      if (gkdial.always_tray && gkdial.tray)
1304 +           gtk_widget_show_all (gkdial.tray);
1305 +    }
1306    else
1307      {
1308        if (gkdial.tray)
1309 diff -Nur gkdial-1.8.1.orig/src/main_loop.c gkdial-1.8.1/src/main_loop.c
1310 --- gkdial-1.8.1.orig/src/main_loop.c   2003-06-27 23:32:32.000000000 +0200
1311 +++ gkdial-1.8.1/src/main_loop.c        2004-10-16 11:30:29.000000000 +0200
1312 @@ -114,14 +114,22 @@
1313        g_free (statusbar_text);
1314      }
1315    else
1316 -    gtk_statusbar_push (GTK_STATUSBAR (gkdial->details_statusbar),
1317 -                       gkdial->status_state_id, _("Dialing..."));
1318 +    {
1319 +      gchar *status_phone;
1320 +
1321 +      status_phone = g_strdup_printf (_("Dialling %s"),
1322 +        gtk_editable_get_chars (GTK_EDITABLE (
1323 +                                  GTK_COMBO (gkdial->main_combo)->entry), 0, -1));
1324 +      gtk_statusbar_push (GTK_STATUSBAR (gkdial->details_statusbar),
1325 +                         gkdial->status_state_id, status_phone);
1326 +      g_free (status_phone);
1327 +    }
1328
1329    if (gkdial->connected_to)
1330 -    gkdial_details_set_title (gkdial, _("Connecting to: %s - GkDial"),
1331 +    gkdial_details_set_title (gkdial, _("Connecting to: %s"),
1332                               gkdial->connected_to);
1333    else
1334 -    gkdial_details_set_title (gkdial, _("Connecting to: unknown - GkDial"));
1335 +    gkdial_details_set_title (gkdial, _("Connecting"));
1336
1337    gtk_image_set_from_pixbuf (GTK_IMAGE (gkdial->tray_icon),
1338                              gkdial->pixbuf_ppp_trying);
1339 @@ -136,11 +144,8 @@
1340        gtk_widget_hide (gkdial->menu_item_connect);
1341        gtk_widget_show (gkdial->menu_item_disconnect);
1342      }
1343 -  if (GTK_WIDGET_VISIBLE (gkdial->main_window))
1344 -    {
1345 -      gtk_widget_hide (gkdial->main_window);
1346 -      gtk_widget_show (gkdial->details_window);
1347 -    }
1348 +  gtk_widget_show (gkdial->details_window);
1349 +  gtk_window_present(GTK_WINDOW(gkdial->details_window));
1350
1351    /*
1352     * start clock
1353 @@ -206,7 +211,7 @@
1354           gtk_widget_show (gkdial->main_window);
1355         }
1356
1357 -      gkdial_details_set_title (gkdial, _("Disconnected - GkDial"));
1358 +      gkdial_details_set_title (gkdial, _("Disconnected"));
1359        if (gkdial->connected_to != NULL)
1360         {
1361           g_free (gkdial->connected_to);
1362 @@ -234,10 +239,10 @@
1363                       gkdial->status_state_id, _("Connected."));
1364
1365    if (gkdial->connected_to)
1366 -    gkdial_details_set_title (gkdial, _("Connected to: %s - GkDial"),
1367 +    gkdial_details_set_title (gkdial, _("Connected to: %s"),
1368                               gkdial->connected_to);
1369    else
1370 -    gkdial_details_set_title (gkdial, _("Connected to: unknown - GkDial"));
1371 +    gkdial_details_set_title (gkdial, _("Connected to: unknown"));
1372
1373    gtk_image_set_from_pixbuf (GTK_IMAGE (gkdial->tray_icon),
1374                              gkdial->pixbuf_ppp_none);
1375 @@ -252,11 +257,7 @@
1376        gtk_widget_hide (gkdial->menu_item_connect);
1377        gtk_widget_show (gkdial->menu_item_disconnect);
1378      }
1379 -  if (GTK_WIDGET_VISIBLE (gkdial->main_window))
1380 -    {
1381 -      gtk_widget_hide (gkdial->main_window);
1382 -      gtk_widget_show (gkdial->details_window);
1383 -    }
1384 +  gtk_widget_show (gkdial->details_window);
1385  #ifdef DEBUG
1386         fprintf (stderr, "hide_dw_on_conn: %d\n",
1387                 gkdial->hide_dw_on_conn);
1388 @@ -292,7 +293,6 @@
1389                              gkdial->connected_to);
1390    gkdial_exec (gkdial, command, CONNECTING);
1391    g_free (command);
1392 -  pthread_exit (NULL);
1393  }
1394
1395  void
1396 @@ -313,13 +313,10 @@
1397
1398    gkdial->was_gkdial = TRUE;
1399
1400 -  gkdial_details_set_title (gkdial, _("Connecting to: %s - GkDial"),
1401 +  gkdial_details_set_title (gkdial, _("Connecting to: %s"),
1402                             gkdial->connected_to);
1403 -
1404 -       g_free (gkdial->connecting_thread);
1405 -  gkdial->connecting_thread = g_new (pthread_t, 1);
1406 -  pthread_create (gkdial->connecting_thread, NULL,
1407 -                 gk_thread_connect, (gpointer) gkdial);
1408 +
1409 +  gk_thread_connect ((gpointer) gkdial);
1410  }
1411
1412  /*
1413 @@ -330,7 +327,7 @@
1414  {
1415    GkDial *gkdial = (GkDial *) data;
1416    gchar *disconnect_cmd = DOWNCMD;
1417 -
1418 +
1419    /*
1420     * this shows that gkdial was the responsible for the connection being
1421     * closed
1422 diff -Nur gkdial-1.8.1.orig/src/peers_list.c gkdial-1.8.1/src/peers_list.c
1423 --- gkdial-1.8.1.orig/src/peers_list.c  2003-06-27 01:14:51.000000000 +0200
1424 +++ gkdial-1.8.1/src/peers_list.c       2004-10-16 11:30:29.000000000 +0200
1425 @@ -15,8 +15,7 @@
1426  {
1427    GtkTreeStore *tree_model;
1428
1429 -  tree_model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING);        /* peer
1430 -                                                                                */
1431 +  tree_model = gtk_tree_store_new (NUM_COLUMNS, G_TYPE_BOOLEAN, G_TYPE_STRING);        /* peer */
1432
1433    return tree_model;
1434  }
1435 @@ -317,6 +316,9 @@
1436             if (!strcmp (tmp, ".bak"))
1437               continue;
1438
1439 +      if (!strcmp(files_peers->d_name, "lap"))
1440 +        continue;
1441 +
1442           /*
1443            * for the prefs peers_list
1444            */
1445 @@ -356,15 +358,20 @@
1446
1447        if (peer_to_select && strcmp ("", peer_to_select))
1448         {
1449 +      GtkTreeIter *iter;
1450  #ifdef DEBUG
1451           printf ("setting combo to: %s\n", peer_to_select);
1452  #endif
1453           prefs_peers_set_default (gkdial, peer_to_select);
1454           combo_set_selection (gkdial, peer_to_select);
1455 +      iter = prefs_peers_list_find (gkdial, peer_to_select);
1456 +      prefs_peers_list_select (gkdial, iter);
1457 +      gtk_tree_iter_free (iter);
1458         }
1459        else
1460         {
1461           GList *first_peer;
1462 +      GtkTreeIter *iter;
1463
1464           first_peer = g_list_first (peers_list);
1465  #ifdef DEBUG
1466 @@ -372,6 +379,10 @@
1467                   (gchar *) first_peer->data);
1468  #endif
1469           combo_set_selection (gkdial, (gchar *) first_peer->data);
1470 +
1471 +      iter = prefs_peers_list_find (gkdial, first_peer->data);
1472 +      prefs_peers_list_select (gkdial, iter);
1473 +      gtk_tree_iter_free (iter);
1474         }
1475      }
1476
1477 @@ -395,3 +406,22 @@
1478
1479    peers_list_fill (gkdial, TRUE);
1480  }
1481 +
1482 +void
1483 +gkdial_main_select_peer (GtkWidget * widget, gpointer data)
1484 +{
1485 +  GkDial *gkdial = data;
1486 +  gchar *peer_to_select;
1487 +  GtkTreeIter *iter;
1488 +
1489 +  peer_to_select =
1490 +           gtk_editable_get_chars (GTK_EDITABLE
1491 +                                   (GTK_COMBO (gkdial->main_combo)->entry), 0, -1);
1492 +
1493 +  iter = prefs_peers_list_find (gkdial, peer_to_select);
1494 +  if (iter)
1495 +  {
1496 +    prefs_peers_list_select (gkdial, iter);
1497 +    gtk_tree_iter_free (iter);
1498 +  }
1499 +}
1500 diff -Nur gkdial-1.8.1.orig/src/peers_list.h gkdial-1.8.1/src/peers_list.h
1501 --- gkdial-1.8.1.orig/src/peers_list.h  2003-06-27 01:14:51.000000000 +0200
1502 +++ gkdial-1.8.1/src/peers_list.h       2004-08-26 18:00:27.000000000 +0200
1503 @@ -15,6 +15,8 @@
1504    NUM_COLUMNS
1505  };
1506
1507 +void gkdial_main_select_peer (GtkWidget * widget, gpointer data);
1508 +
1509  void prefs_peers_list_select (GkDial * gkdial, GtkTreeIter * iter);
1510
1511  gboolean peers_list_get_selected (GkDial * gkdial);
1512 diff -Nur gkdial-1.8.1.orig/src/ppp_info.c gkdial-1.8.1/src/ppp_info.c
1513 --- gkdial-1.8.1.orig/src/ppp_info.c    2003-06-27 01:14:51.000000000 +0200
1514 +++ gkdial-1.8.1/src/ppp_info.c 2004-10-16 11:30:29.000000000 +0200
1515 @@ -11,7 +11,7 @@
1516
1517  #include <linux/if.h>
1518  #include <linux/ppp_defs.h>
1519 -#include <linux/ppp.h>
1520 +#include <linux/if_ppp.h>
1521
1522  #include <time.h>
1523  #include <ctype.h>
1524 diff -Nur gkdial-1.8.1.orig/src/tray.c gkdial-1.8.1/src/tray.c
1525 --- gkdial-1.8.1.orig/src/tray.c        2003-06-27 01:14:51.000000000 +0200
1526 +++ gkdial-1.8.1/src/tray.c     2004-10-16 11:30:29.000000000 +0200
1527 @@ -6,24 +6,32 @@
1528  #include "prefs.h"
1529  #include "images.h"
1530  #include "main_loop.h"
1531 -
1532 +static GtkWidget *menu;
1533 +
1534  gboolean
1535  tray_icon_clicked (GtkWidget * w, GdkEventButton * event, gpointer data)
1536  {
1537    GkDial *gkdial = (GkDial *) data;
1538    GtkWidget *window_to_handle;
1539
1540 -  if (gkdial->state == CONNECTING || gkdial->state == CONNECTED)
1541 -    window_to_handle = gkdial->details_window;
1542 -  else
1543 -    window_to_handle = gkdial->main_window;
1544 -
1545 -  if (event->button != 3)
1546 +  if (event->type == GDK_BUTTON_PRESS)
1547      {
1548 -      if (GTK_WIDGET_VISIBLE (window_to_handle))
1549 -       gtk_widget_hide (window_to_handle);
1550 +      gtk_menu_popup (GTK_MENU (menu),
1551 +                       NULL, NULL,
1552 +                       NULL, w, event->button, event->time);
1553 +               //gnome_popup_menu_do_popup (menu, NULL, NULL, NULL, NULL, NULL);
1554 +        return TRUE;
1555 +       }
1556 +
1557 +  if (event->type == GDK_2BUTTON_PRESS)
1558 +    {
1559 +      if (gkdial->state == CONNECTING || gkdial->state == CONNECTED)
1560 +        window_to_handle = gkdial->details_window;
1561        else
1562 -       gtk_widget_show (window_to_handle);
1563 +        window_to_handle = gkdial->main_window;
1564 +
1565 +      if (!GTK_WIDGET_VISIBLE (window_to_handle))
1566 +        gtk_widget_show (window_to_handle);
1567        return TRUE;
1568      }
1569    else
1570 @@ -43,7 +51,20 @@
1571  void
1572  tray_exit_cb (GtkWidget * w, gpointer data)
1573  {
1574 -  gtk_main_quit ();
1575 +  GtkWidget *dialog;
1576 +  GkDial *gkdial = data;
1577 +
1578 +  dialog = gtk_message_dialog_new(GTK_WINDOW(gkdial->main_window),
1579 +                                  GTK_DIALOG_MODAL,
1580 +                                  GTK_MESSAGE_QUESTION, GTK_BUTTONS_YES_NO,
1581 +                                  _("Quit Dialler?"));
1582 +  gtk_widget_show_all(dialog);
1583 +  if (gtk_dialog_run(GTK_DIALOG(dialog)) == GTK_RESPONSE_YES)
1584 +    {
1585 +      gtk_widget_destroy(dialog);
1586 +      gtk_main_quit ();
1587 +    }
1588 +  gtk_widget_destroy(dialog);
1589  }
1590
1591  GtkWidget *
1592 @@ -54,11 +75,10 @@
1593       G_CALLBACK (gkdial_prefs_show)},
1594      {N_("Co_nnect"), GTK_STOCK_YES, G_CALLBACK (gk_connect)},
1595      {N_("Di_sconnect"), GTK_STOCK_NO, G_CALLBACK (gk_disconnect)},
1596 -    {N_("E_xit"), GTK_STOCK_CLOSE, G_CALLBACK (tray_exit_cb)},
1597 +    {N_("_Quit"), GTK_STOCK_QUIT, G_CALLBACK (tray_exit_cb)},
1598      {NULL, NULL, NULL}
1599    };
1600
1601 -  GtkWidget *menu;
1602    int i;
1603
1604    menu = gtk_menu_new ();
1605 @@ -83,14 +103,14 @@
1606        gtk_widget_show (item);
1607
1608        if (menuitems[i].callback == G_CALLBACK (gk_connect))
1609 -       gkdial->menu_item_connect = item;
1610 +        gkdial->menu_item_connect = item;
1611        else if (menuitems[i].callback == G_CALLBACK (gk_disconnect))
1612         {
1613           gkdial->menu_item_disconnect = item;
1614           gtk_widget_hide (gkdial->menu_item_disconnect);
1615         }
1616        else if (menuitems[i].callback == G_CALLBACK (gkdial_prefs_show))
1617 -       gkdial->menu_item_prefs = item;
1618 +        gkdial->menu_item_prefs = item;
1619
1620        gtk_menu_shell_append ((GtkMenuShell *) (menu), item);
1621        if (menuitems[i].callback != NULL)
1622 @@ -109,7 +129,7 @@
1623    GtkWidget *box;
1624    GdkPixbuf *pixbuf;
1625
1626 -  gkdial->tray = GTK_WIDGET (egg_tray_icon_new ("GkDial Tray Icon"));
1627 +  gkdial->tray = GTK_WIDGET (egg_tray_icon_new ("Dialler Tray Icon"));
1628
1629    box = gtk_event_box_new ();
1630    g_signal_connect (G_OBJECT (box), "button_press_event",
1631 @@ -118,13 +138,6 @@
1632
1633    gkdial->tray_icon = gtk_image_new_from_pixbuf (gkdial->pixbuf_ppp_off);
1634    gtk_container_add (GTK_CONTAINER (box), gkdial->tray_icon);
1635 -
1636 -  /*
1637 -   * from gnome-cd gcd->tray_tips = gtk_tooltips_new ();
1638 -   * gtk_tooltips_set_tip (GTK_TOOLTIPS(gcd->tray_tips), gcd->tray,
1639 -   * _("CD Player"), NULL);
1640 -   */
1641 -
1642 -  gnome_popup_menu_attach (tray_menu_init (gkdial), box, NULL);
1643 -
1644 +tray_menu_init (gkdial);
1645 +  //gnome_popup_menu_attach (tray_menu_init (gkdial), box, NULL);
1646  }
1647 diff -Nur gkdial-1.8.1.orig/src/util.c gkdial-1.8.1/src/util.c
1648 --- gkdial-1.8.1.orig/src/util.c        2003-06-27 22:30:29.000000000 +0200
1649 +++ gkdial-1.8.1/src/util.c     2004-10-16 11:30:29.000000000 +0200
1650 @@ -76,8 +76,7 @@
1651      {
1652      case 0:
1653        gk_dialog (GTK_MESSAGE_INFO,
1654 -                _("The connection was normaly finished\n"
1655 -                  "by another application."));
1656 +                _("Connection timed out.\nIs your modem connected?"));
1657        break;
1658      case 1:
1659        gk_dialog (GTK_MESSAGE_ERROR,
1660 @@ -86,11 +85,11 @@
1661        break;
1662      case 2:
1663        gk_dialog (GTK_MESSAGE_ERROR,
1664 -                _("Options error when running:\n%s."), gkdial->command);
1665 +                _("No modem or bad options."));
1666        retry_connection = FALSE;
1667        break;
1668      case 3:
1669 -      gk_dialog (GTK_MESSAGE_ERROR,
1670 +      gk_dialog (GTK_MESSAGE_INFO,
1671                  _("You are not allowed to run:\n%s."), gkdial->command);
1672        retry_connection = FALSE;
1673        break;
1674 @@ -105,17 +104,17 @@
1675                             gkdial->status_state_id,
1676                             _("Connection terminated by signal..."));
1677        else
1678 -       gk_dialog (GTK_MESSAGE_ERROR,
1679 +       gk_dialog (GTK_MESSAGE_INFO,
1680                    _("The connection was terminated prematurely "
1681                      "by a signal it received."));
1682        break;
1683      case 6:
1684 -      gk_dialog (GTK_MESSAGE_ERROR,
1685 +      gk_dialog (GTK_MESSAGE_INFO,
1686                  _("The serial port could not be locked."));
1687        retry_connection = FALSE;
1688        break;
1689      case 7:
1690 -      gk_dialog (GTK_MESSAGE_ERROR,
1691 +      gk_dialog (GTK_MESSAGE_INFO,
1692                  _("The serial port could not be opened."));
1693        retry_connection = FALSE;
1694        break;
1695 @@ -125,13 +124,13 @@
1696                             gkdial->status_state_id,
1697                             _("Connection failed..."));
1698        else
1699 -       gk_dialog (GTK_MESSAGE_ERROR,
1700 +       gk_dialog (GTK_MESSAGE_INFO,
1701                    _("A connection was being tried but could not\n"
1702                      "be completed. Check the /var/log/syslog file\n"
1703                      "for details."));
1704        break;
1705      case 9:
1706 -      gk_dialog (GTK_MESSAGE_ERROR,
1707 +      gk_dialog (GTK_MESSAGE_INFO,
1708                  _("The command specified as argumento to the\n"
1709                    "pty option could not be run."));
1710        retry_connection = FALSE;
1711 @@ -142,7 +141,7 @@
1712                             gkdial->status_state_id,
1713                             _("PPP negotiation failed."));
1714        else
1715 -       gk_dialog (GTK_MESSAGE_ERROR, _("PPP negotiation failed."));
1716 +       gk_dialog (GTK_MESSAGE_INFO, _("PPP negotiation failed."));
1717        break;
1718      case 11:
1719        if (retry_connection)
1720 @@ -150,7 +149,7 @@
1721                             gkdial->status_state_id,
1722                             _("Peer did not authenticate itself."));
1723        else
1724 -       gk_dialog (GTK_MESSAGE_ERROR, _("Peer did not authenticate itself."));
1725 +       gk_dialog (GTK_MESSAGE_INFO, _("Peer did not authenticate itself."));
1726        break;
1727      case 12:
1728        gk_dialog (GTK_MESSAGE_INFO,
1729 @@ -158,7 +157,7 @@
1730        retry_connection = FALSE;
1731        break;
1732      case 13:
1733 -      gk_dialog (GTK_MESSAGE_ERROR,
1734 +      gk_dialog (GTK_MESSAGE_INFO,
1735                  _("Connection terminated because it reached\n"
1736                    "the time limit."));
1737        retry_connection = FALSE;
1738 @@ -298,7 +297,7 @@
1739         {
1740           printf ("%s\n", gk_args[0]);
1741           gk_dialog (GTK_MESSAGE_ERROR,
1742 -                    _("Error! Could not execute %s."), gk_args[0]);
1743 +                 _("Error! Could not execute %s."), gk_args[0]);
1744         }
1745      }
1746    else if (pid == -1)
1747 @@ -306,23 +305,35 @@
1748    else
1749      {
1750        if (what == CONNECTING)
1751 -       {
1752 -         waitpid (pid, &status, 0);
1753 -
1754 -         /*
1755 -          * unlock state
1756 -          */
1757 -         gkdial->state_locked = FALSE;
1758 -
1759 -         if (WIFEXITED (status))
1760 -           {
1761 -             gkdial->return_code = WEXITSTATUS (status);
1762 -                       g_free (gkdial->command);
1763 -             gkdial->command = g_strdup (command);
1764 -           }
1765 -       }
1766 -      else
1767 -       wait (NULL);
1768 +        {
1769 +          waitpid (pid, &status, 0);
1770 +
1771 +          /*
1772 +           * unlock state
1773 +           */
1774 +          gkdial->state_locked = FALSE;
1775 +
1776 +          if (WIFEXITED (status))
1777 +            {
1778 +              gkdial->return_code = WEXITSTATUS (status);
1779 +                g_free (gkdial->command);
1780 +              gkdial->command = g_strdup (command);
1781 +            }
1782 +        }
1783 +        else
1784 +        {
1785 +          waitpid (pid, &status, 0);
1786 +
1787 +          if (WIFEXITED (status) && WEXITSTATUS (status))
1788 +            {
1789 +              gk_dialog (GTK_MESSAGE_ERROR,
1790 +                 _("<b>An error ocurred when trying to disconnect.</b>"
1791 +                   "\n\n"
1792 +                   "You may not have the needed permissions or "
1793 +                   "there was no connection to be finished "
1794 +                   "(stale lock file?)."));
1795 +            }
1796 +        }
1797      }
1798
1799         for (i = 0; gk_args[i] != NULL; i++)
1800 @@ -336,13 +347,13 @@
1801    gint a;
1802    pid_t pid;
1803    gchar **command;
1804 +  gchar *fcmd = g_strdup_printf("%s > /dev/null 2>&1",cmd);
1805
1806 -  command = g_malloc (sizeof (gchar *) * 5);
1807 -  command[0] = g_strdup ("/usr/bin/gksu");
1808 -  command[1] = g_strdup ("-m");
1809 -  command[2] = g_strdup (msg);
1810 -  command[3] = g_strdup (cmd);
1811 -  command[4] = NULL;
1812 +  command = g_malloc (sizeof (gchar *) * 4);
1813 +  command[0] = g_strdup (PREFIX "/bin/gpe-su");
1814 +  command[1] = g_strdup ("-c");
1815 +  command[2] = fcmd;
1816 +  command[3] = NULL;
1817
1818    pid = fork ();
1819    if (pid == 0)