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 @@ 1 - Internet Dialler + Modem Dialler GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER False @@ -22,7 +22,7 @@ 2 True False - 6 + 0 @@ -174,7 +174,7 @@ True GTK_ORIENTATION_HORIZONTAL - GTK_TOOLBAR_BOTH + GTK_TOOLBAR_ICONS True True @@ -217,7 +217,7 @@ True - False + True False @@ -245,29 +245,15 @@ + 3 True - 5 + 3 5 False - 0 + 3 5 - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 0 - - - 0 - 5 - 4 - 5 - fill - - - - True 0 @@ -288,7 +274,7 @@ - 240 + 120 True True True @@ -307,7 +293,7 @@ 0 True - * + * False @@ -364,7 +350,7 @@ - Dialler: Details + Details GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER False @@ -671,10 +657,12 @@ - Dialler: Preferences + Preferences GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER True + 240 + 320 True False True @@ -691,7 +679,7 @@ - 6 + 3 True True True @@ -764,8 +752,6 @@ - 209 - 243 True True GTK_POLICY_AUTOMATIC @@ -824,144 +810,162 @@ 0 - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT - - 5 + True - 2 - 2 - False - 11 - 0 - - - - True - True - _Retry if connection quits when dialing - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 1 - 0 - 1 - expand|shrink|fill - shrink - - + GTK_SHADOW_NONE - + True - True - Reconnect if connection is lost - True - GTK_RELIEF_NORMAL - True - False - False - True - - - 0 - 1 - 1 - 2 - expand|shrink|fill - shrink - - + 0 + 0.5 + GTK_SHADOW_ETCHED_IN - - - True - False - 5 + + + 5 + True + 4 + 2 + False + 11 + 0 + + + + True + True + _Retry if connection quits when dialing + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 0 + 1 + expand|shrink|fill + shrink + + + + + + True + True + Reconnect if connection is lost + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 3 + 4 + expand|shrink|fill + shrink + + + + + + True + False + 5 + + + + True + Times to retry: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + The number of tries GkDial should perform. Use '0' for infinite. + True + 1 + 0 + False + GTK_UPDATE_ALWAYS + False + False + 0 0 100 1 10 10 + + + 0 + True + True + + + + + 0 + 1 + 1 + 2 + 10 + shrink|fill + shrink|fill + + + + - + True - Times to retry: + Dialing False False GTK_JUSTIFY_LEFT False False - 0 + 0.5 0.5 0 0 - 0 - False - False - - - - - - True - The number of tries GkDial should perform. Use '0' for infinite. - True - 1 - 0 - False - GTK_UPDATE_ALWAYS - False - False - 0 0 100 1 10 10 - - - 0 - True - True + label_item - - 1 - 2 - 0 - 1 - 10 - shrink|fill - shrink|fill - - - - - True - Dialing - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - 0 @@ -971,7 +975,7 @@ - False + True True @@ -996,216 +1000,234 @@ - + True - False - 0 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT - + True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN + GTK_SHADOW_NONE - - 5 + True - 2 - 3 False - 13 - 0 + 0 - + True - Hides main window when starting up (implies on Always show tray icon) - True - Main window is hidden when the program starts - True - GTK_RELIEF_NORMAL - True - False - False - True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 5 + True + 2 + 3 + False + 7 + 0 + + + + True + Hides main window when starting up (implies on Always show tray icon) + True + Hide main window on startup + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 0 + 1 + expand + + + + + + True + Exit application after connection is terminated. + True + Exit Dialler when connection is closed + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 1 + 2 + expand + + + + + + + + True + Main Window + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + - 0 - 2 - 0 - 1 - expand + 0 + True + True - + True - Hides main window when starting up (implies on Always show tray icon) - True - Exit Dialler when connection is closed - True - GTK_RELIEF_NORMAL - True - False - False - True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + True + True + Hide details window when connection is accomplished + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + + + True + Details Window + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + - 0 - 2 - 1 - 2 - expand + 0 + True + True - - - - - - True - Main Window - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - True - True - Hide details window when connection is accomplished - True - GTK_RELIEF_NORMAL - True - False - False - True - - - - - - True - Details Window - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - - 0 - True - True - - - - - - True - 0 - 0.5 - GTK_SHADOW_ETCHED_IN - - - - 5 - True - 1 - 3 - False - 14 - 0 - + True - Always shows tray icon, despite the connection state - True - Always show tray icon - True - GTK_RELIEF_NORMAL - True - False - False - True + 0 + 0.5 + GTK_SHADOW_ETCHED_IN + + + + 5 + True + 1 + 3 + False + 14 + 0 + + + + True + Always shows tray icon, despite the connection state + True + Always show tray icon + True + GTK_RELIEF_NORMAL + True + False + False + True + + + 0 + 2 + 0 + 1 + expand + + + + + + + + True + Tray Icon + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + label_item + + - 0 - 2 - 0 - 1 - expand + 0 + True + True - - - - True - Tray Icon - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - label_item - - - - 0 - True - True - - False + True True @@ -1252,7 +1274,7 @@ True 1 0.5 - 0.03 + 0.03 1 0 0 @@ -1286,6 +1308,8 @@ GTK_WINDOW_TOPLEVEL GTK_WIN_POS_CENTER True + 240 + 300 True False True @@ -1296,14 +1320,13 @@ - 2 + 3 True False - 5 + 3 - 4 True True True @@ -1313,312 +1336,330 @@ False - - 12 + True - 7 - 2 - False - 8 - 5 + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT - + True - Connection name: - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 0 - 1 - fill - - - + GTK_SHADOW_NONE - - - True - True - True - True - 255 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - - - - True - Phone number: - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 1 - 2 - fill - - - - - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 1 - 2 - - - - - - - True - - - 0 - 2 - 2 - 3 - fill - - - - - - - True - User name: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 3 - 4 - fill - - - + + + 12 + True + 7 + 2 + False + 8 + 5 - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 3 - 4 - - - + + + True + Connection name: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 0 + 1 + fill + + + - - - True - Password: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 4 - 5 - fill - - - + + + True + True + True + True + 255 + + True + * + False + + + 1 + 2 + 0 + 1 + + + - - - True - True - True - False - 0 - - True - * - False - - - 1 - 2 - 4 - 5 - - - + + + True + Phone number: + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + - - - True - - - 0 - 2 - 5 - 6 - fill - - - + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 1 + 2 + + + - - - True - Authentication: - False - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - 1 - 6 - 7 - fill - - - + + + True + + + 0 + 2 + 2 + 3 + fill + + + - - - True - True - False - False - False - False + + + True + User name: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 3 + 4 + fill + + + - - - True - True - False - True - 0 - - True - * - False - - + + + True + True + True + True + 0 + + True + * + False + + + 1 + 2 + 3 + 4 + + + - - - True - GTK_SELECTION_BROWSE + + + True + Password: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 4 + 5 + fill + + + - + True True - PAP + True + False + 0 + + True + * + False + + 1 + 2 + 4 + 5 + + - + True - True - CHAP + + 0 + 2 + 5 + 6 + fill + + + + + + + True + Authentication: + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 6 + 7 + fill + + - + True - True - CHAT + True + False + False + False + False + + + + True + True + False + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + True + True + PAP + + + + + + True + True + CHAP + + + + + + True + True + CHAT + + + + + + 1 + 2 + 6 + 7 + + - - 1 - 2 - 6 - 7 - - - False + True True @@ -1685,7 +1726,7 @@ 220 True - * + * False @@ -1730,7 +1771,7 @@ 220 True - * + * False @@ -1775,7 +1816,7 @@ 220 True - * + * False @@ -1788,7 +1829,7 @@ - False + True True @@ -1836,7 +1877,7 @@ True 1 0.5 - 0.03 + 0.0299999993294 1 0 0 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 ")); + g_strdup (_("GPE port by Florian Boor ")); 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 \n\n" - "Thanks to:\n\n" - "\tLeandro A. F. Pereira \n\n" + _("Modem Dialler (GkDial) %s\n\n" + "A PPP setup and dialing tool.\n\n" + "Author:\n" + "Gustavo Noronha Silva \n\n" + "Thanks to:\n" + "Leandro A. F. Pereira \n\n" "%s"), PACKAGE_VERSION, translator_credits); g_free (translator_credits);