diff -u -r -N LinPopUp-1.2.0.orig/src/custom.c LinPopUp-1.2.0/src/custom.c --- LinPopUp-1.2.0.orig/src/custom.c Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/custom.c Wed Sep 11 21:35:14 2002 @@ -45,6 +45,7 @@ static GtkWidget *rc_check_self_send; static GtkWidget *rc_check_confirm; static GtkWidget *rc_check_wrap_to_first; +static GtkWidget *rc_check_beep_new_message; static char check_flag = 0; @@ -146,6 +147,7 @@ user_rc.self_send = FALSE; user_rc.confirm = TRUE; user_rc.wrap_to_first = TRUE; + user_rc.beep_new_message = TRUE; } @@ -228,6 +230,7 @@ user_rc.self_send = GTK_TOGGLE_BUTTON (rc_check_self_send)->active; user_rc.auto_iconify = GTK_TOGGLE_BUTTON (rc_check_auto_iconify)->active; user_rc.wrap_to_first = GTK_TOGGLE_BUTTON (rc_check_wrap_to_first)->active; + user_rc.beep_new_message = GTK_TOGGLE_BUTTON (rc_check_beep_new_message)->active; save_rc (); @@ -290,7 +293,6 @@ /* -- create the window and place it -- */ rc_window = gtk_window_new (GTK_WINDOW_DIALOG); - gtk_widget_set_usize (GTK_WIDGET (rc_window), 400, 375); gtk_widget_realize (rc_window); gtk_window_set_title (GTK_WINDOW (rc_window), "Preferences"); gdk_window_get_origin (window->window, &x, &y); @@ -304,14 +306,14 @@ gtk_frame_set_shadow_type (GTK_FRAME (rc_frame), GTK_SHADOW_OUT); /* -- a table to pack widgets -- */ - rc_table = gtk_table_new (15, 17, FALSE); + rc_table = gtk_table_new (2, 1, FALSE); gtk_container_add (GTK_CONTAINER (rc_frame), rc_table); gtk_container_border_width (GTK_CONTAINER (rc_table), 5); /* -- Create a new notebook, and pack it to the table -- */ rc_notebook = gtk_notebook_new (); gtk_notebook_set_tab_pos (GTK_NOTEBOOK (rc_notebook), GTK_POS_TOP); - gtk_table_attach (GTK_TABLE (rc_table), rc_notebook, 0, 15, 0, 16, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 5); + gtk_table_attach (GTK_TABLE (rc_table), rc_notebook, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND, 0, 5); gtk_widget_show (rc_notebook); @@ -326,17 +328,16 @@ /* -- Check interval frame -- */ rc_frame = create_frame (rc_vbox, " *Check for incoming messages : ", FALSE, FALSE, GTK_SHADOW_ETCHED_IN); - gtk_widget_set_usize (rc_frame, 350, 80); - rc_frame_table = gtk_table_new (2, 5, FALSE); + rc_frame_table = gtk_table_new (2, 2, FALSE); gtk_container_border_width (GTK_CONTAINER (rc_frame_table), 5); rc_radio_check = gtk_radio_button_new_with_label (NULL, "Every ... second(s)"); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_check, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_check, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_radio_check); rc_radio_never = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (rc_radio_check)), "Never"); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_never, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_never, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_radio_never); if (user_rc.message_check_interval) @@ -347,7 +348,7 @@ rc_adj = gtk_adjustment_new (check_interval, 1, 10, 1, 0, 0); rc_spin = gtk_spin_button_new (GTK_ADJUSTMENT (rc_adj), 0, 0); gtk_spin_button_set_update_policy (GTK_SPIN_BUTTON (rc_spin), GTK_UPDATE_ALWAYS); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_spin, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_spin, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_spin); gtk_signal_connect (GTK_OBJECT (rc_radio_check), "clicked", GTK_SIGNAL_FUNC (check_set_interval), GINT_TO_POINTER (TRUE)); @@ -372,9 +373,8 @@ /* -- Reply frame -- */ rc_frame = create_frame (rc_vbox, " Reply : ", FALSE, FALSE, GTK_SHADOW_ETCHED_IN); - gtk_widget_set_usize (rc_frame, 350, 80); - rc_frame_table = gtk_table_new (2, 5, FALSE); + rc_frame_table = gtk_table_new (2, 2, FALSE); gtk_container_border_width (GTK_CONTAINER (rc_frame_table), 5); gtk_container_add (GTK_CONTAINER (rc_frame), rc_frame_table); @@ -382,7 +382,7 @@ rc_label = gtk_label_new ("Quote character :"); gtk_misc_set_alignment (GTK_MISC (rc_label), 0, 0); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_label); sprintf (quote, "%c", user_rc.quote); @@ -390,50 +390,49 @@ rc_quote = gtk_entry_new_with_max_length (1); gtk_entry_set_text (GTK_ENTRY (rc_quote), quote); gtk_entry_set_editable (GTK_ENTRY (rc_quote), 1); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_quote, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_quote, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_quote); rc_label = gtk_label_new ("Reply Header :"); gtk_misc_set_alignment (GTK_MISC (rc_label), 0, 0); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_label); rc_header = gtk_entry_new_with_max_length (50); gtk_entry_set_text (GTK_ENTRY (rc_header), user_rc.quote_string); gtk_entry_set_editable (GTK_ENTRY (rc_header), 1); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_header, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_header, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_header); /* -- host frame -- */ rc_frame = create_frame (rc_vbox, " Delivery address : ", FALSE, FALSE, GTK_SHADOW_ETCHED_IN); - gtk_widget_set_usize (rc_frame, 350, 100); - rc_frame_table = gtk_table_new (2, 5, FALSE); + rc_frame_table = gtk_table_new (3, 2, FALSE); gtk_container_border_width (GTK_CONTAINER (rc_frame_table), 5); gtk_container_add (GTK_CONTAINER (rc_frame), rc_frame_table); gtk_widget_show (rc_frame_table); rc_radio_default = gtk_radio_button_new_with_label (NULL, "Use default host :"); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_default, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_default, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_radio_default); rc_radio_guess = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (rc_radio_default)), "Guess"); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_guess, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_guess, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_radio_guess); rc_radio_blank = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (rc_radio_default)), "Leave blank"); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_blank, 0, 1, 3, 4, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_blank, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_radio_blank); rc_dhost = gtk_entry_new_with_max_length (100); gtk_entry_set_text (GTK_ENTRY (rc_dhost), user_rc.deliver_adr); gtk_entry_set_editable (GTK_ENTRY (rc_dhost), 1); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_dhost, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 10, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_dhost, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 10, 0); gtk_widget_show (rc_dhost); gtk_signal_connect (GTK_OBJECT (rc_radio_default), "clicked", GTK_SIGNAL_FUNC (reply_set_adr), GINT_TO_POINTER (DHOST)); @@ -470,43 +469,41 @@ /* -- Identity frame -- */ rc_frame = create_frame (rc_vbox, " Identity : ", FALSE, FALSE, GTK_SHADOW_ETCHED_IN); - gtk_widget_set_usize (rc_frame, 350, 80); - rc_frame_table = gtk_table_new (2, 5, FALSE); + rc_frame_table = gtk_table_new (2, 2, FALSE); gtk_container_border_width (GTK_CONTAINER (rc_frame_table), 5); gtk_container_add (GTK_CONTAINER (rc_frame), rc_frame_table); gtk_widget_show (rc_frame_table); rc_label = gtk_label_new ("User Name :"); gtk_misc_set_alignment (GTK_MISC (rc_label), 0, 0); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_label); rc_samba_username = gtk_entry_new_with_max_length (sizeof (user_rc.samba_username) - 1); gtk_entry_set_text (GTK_ENTRY (rc_samba_username), user_rc.samba_username); gtk_entry_set_editable (GTK_ENTRY (rc_samba_username), 1); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_samba_username, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_samba_username, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_samba_username); rc_label = gtk_label_new ("Host Name :"); gtk_misc_set_alignment (GTK_MISC (rc_label), 0, 0); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 2, 3, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_label); rc_samba_nbiosname = gtk_entry_new_with_max_length (sizeof (user_rc.samba_nbiosname) - 1); gtk_entry_set_text (GTK_ENTRY (rc_samba_nbiosname), user_rc.samba_nbiosname); gtk_entry_set_editable (GTK_ENTRY (rc_samba_nbiosname), 1); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_samba_nbiosname, 1, 2, 2, 3, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_samba_nbiosname, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_samba_nbiosname); /* -- misc frame -- */ rc_frame = create_frame (rc_vbox, " Arguments : ", FALSE, FALSE, GTK_SHADOW_ETCHED_IN); - gtk_widget_set_usize (rc_frame, 350, 80); - rc_frame_table = gtk_table_new (2, 5, FALSE); + rc_frame_table = gtk_table_new (1, 2, FALSE); gtk_container_border_width (GTK_CONTAINER (rc_frame_table), 5); gtk_container_add (GTK_CONTAINER (rc_frame), rc_frame_table); @@ -514,13 +511,13 @@ rc_label = gtk_label_new ("Optional : "); gtk_misc_set_alignment (GTK_MISC (rc_label), 0, 0); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_label, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_label); rc_samba_misc = gtk_entry_new_with_max_length (sizeof (user_rc.samba_misc) - 1); gtk_entry_set_text (GTK_ENTRY (rc_samba_misc), user_rc.samba_misc); gtk_entry_set_editable (GTK_ENTRY (rc_samba_misc), 1); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_samba_misc, 1, 2, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_samba_misc, 1, 2, 0, 1, GTK_FILL, GTK_FILL, 30, 0); gtk_widget_show (rc_samba_misc); @@ -541,9 +538,8 @@ /* -- Options Frame -- */ rc_frame = create_frame (rc_vbox, " Options : ", FALSE, FALSE, GTK_SHADOW_ETCHED_IN); - gtk_widget_set_usize (rc_frame, 350, 140); - rc_hbox = v_box (rc_frame, TRUE, 10, 15); + rc_hbox = v_box (rc_frame, TRUE, 0, 15); rc_check_confirm = gtk_check_button_new_with_label ("Delivery confirmation"); gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (rc_check_confirm), user_rc.confirm); @@ -565,15 +561,19 @@ gtk_box_pack_start (GTK_BOX (rc_hbox), rc_check_auto_iconify, FALSE, TRUE, 0); gtk_widget_show (rc_check_auto_iconify); + rc_check_beep_new_message = gtk_check_button_new_with_label ("Beep on new message arrival"); + gtk_toggle_button_set_state (GTK_TOGGLE_BUTTON (rc_check_beep_new_message), user_rc.beep_new_message); + gtk_box_pack_start (GTK_BOX (rc_hbox), rc_check_beep_new_message, FALSE, TRUE, 0); + gtk_widget_show (rc_check_beep_new_message); + rc_frame = create_frame (rc_vbox, " Toolbar : ", FALSE, FALSE, GTK_SHADOW_ETCHED_IN); - gtk_widget_set_usize (rc_frame, 350, 100); rc_hbox = h_box (rc_frame, TRUE, 0, 0); /* -- The view Frame -- */ - rc_frame_table = gtk_table_new (1, 3, TRUE); + rc_frame_table = gtk_table_new (3, 1, TRUE); gtk_container_border_width (GTK_CONTAINER (rc_frame_table), 5); rc_radio_both = gtk_radio_button_new_with_label (NULL, "Icons and text"); @@ -611,15 +611,15 @@ /* -- the icons default frame -- */ - rc_frame_table = gtk_table_new (1, 3, TRUE); + rc_frame_table = gtk_table_new (3, 1, TRUE); gtk_container_border_width (GTK_CONTAINER (rc_frame_table), 5); rc_radio_hcolors = gtk_radio_button_new_with_label (NULL, "High colors icons set"); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_hcolors, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_hcolors, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (rc_radio_hcolors); rc_radio_mcolors = gtk_radio_button_new_with_label (gtk_radio_button_group (GTK_RADIO_BUTTON (rc_radio_hcolors)), "16 colors icons set"); - gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_mcolors, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 30, 0); + gtk_table_attach (GTK_TABLE (rc_frame_table), rc_radio_mcolors, 0, 1, 1, 2, GTK_FILL, GTK_FILL, 0, 0); gtk_widget_show (rc_radio_mcolors); gtk_box_pack_start (GTK_BOX (rc_hbox), rc_frame_table, FALSE, TRUE, 0); @@ -651,7 +651,7 @@ gtk_button_box_set_layout (GTK_BUTTON_BOX (rc_hbbox), GTK_BUTTONBOX_END); gtk_button_box_set_spacing (GTK_BUTTON_BOX (rc_hbbox), 5); - gtk_table_attach (GTK_TABLE (rc_table), rc_hbbox, 0, 15, 16, 17, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); + gtk_table_attach (GTK_TABLE (rc_table), rc_hbbox, 0, 1, 1, 2, GTK_FILL, GTK_FILL | GTK_EXPAND, 0, 0); rc_button_ok = box_button (rc_hbbox, "Done"); rc_button_cancel = box_button (rc_hbbox, "Cancel"); diff -u -r -N LinPopUp-1.2.0.orig/src/dialog.c LinPopUp-1.2.0/src/dialog.c --- LinPopUp-1.2.0.orig/src/dialog.c Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/dialog.c Wed Sep 11 21:35:14 2002 @@ -320,6 +320,7 @@ hseparator (alert_vbox); alert_hbox = h_box (alert_vbox, FALSE, 10, 5); + gtk_box_set_child_packing (GTK_BOX (alert_vbox), alert_hbox, FALSE, FALSE, 0, GTK_PACK_START); program_icon (alert_hbox); @@ -376,6 +377,7 @@ hseparator (alert_vbox); alert_hbox = h_box (alert_vbox, FALSE, 0, 5); + gtk_box_set_child_packing (GTK_BOX (alert_vbox), alert_hbox, FALSE, FALSE, 0, GTK_PACK_START); program_icon (alert_hbox); alert_hbox = hbutton_box (alert_hbox); diff -u -r -N LinPopUp-1.2.0.orig/src/menu.c LinPopUp-1.2.0/src/menu.c --- LinPopUp-1.2.0.orig/src/menu.c Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/menu.c Wed Sep 11 21:35:14 2002 @@ -92,8 +92,10 @@ menu_tearoff (menu); - create_menu_item (menu, " New ", TRUE, GTK_SIGNAL_FUNC (send_message), NULL); - create_menu_item (menu, " Reply ", TRUE, GTK_SIGNAL_FUNC (reply_message), NULL); + menu_item = create_menu_item (menu, " New ", TRUE, GTK_SIGNAL_FUNC (send_message), NULL); + ACCEL (menu_item, 'M', GDK_CONTROL_MASK); + menu_item = create_menu_item (menu, " Reply ", TRUE, GTK_SIGNAL_FUNC (reply_message), NULL); + ACCEL (menu_item, 'R', GDK_CONTROL_MASK); menu_separator (menu); @@ -110,19 +112,17 @@ menu_separator (menu); - create_menu_item (menu, " Delete ", TRUE, GTK_SIGNAL_FUNC (delete_showed_message), NULL); + menu_item = create_menu_item (menu, " Delete ", TRUE, GTK_SIGNAL_FUNC (delete_showed_message), NULL); + ACCEL (menu_item, 'D', GDK_CONTROL_MASK); create_menu_item (menu, " Delete All", TRUE, GTK_SIGNAL_FUNC (delete_all_messages), NULL); menu_separator (menu); - create_menu_item (menu, " Quit ", TRUE, GTK_SIGNAL_FUNC (gtk_main_quit), NULL); + menu_item = create_menu_item (menu, " Quit ", TRUE, GTK_SIGNAL_FUNC (gtk_main_quit), NULL); ACCEL (menu_item, 'Q', GDK_CONTROL_MASK); gtk_widget_show (menu_item); - menu_separator (menu); - menu_separator (menu); - @@ -145,9 +145,6 @@ menu_item = create_menu_item (menu, " Preferences ... ", TRUE, GTK_SIGNAL_FUNC (custom_notebook), NULL); - menu_separator (menu); - menu_separator (menu); - @@ -165,8 +162,6 @@ menu_item = create_menu_item (menu, " Save Size ", TRUE, GTK_SIGNAL_FUNC (save_geom), NULL); ACCEL (menu_item, 'G', GDK_CONTROL_MASK); menu_item = create_menu_item (menu, " Reset default Size ", TRUE, GTK_SIGNAL_FUNC (reset_geom), NULL); - menu_separator (menu); - menu_separator (menu); @@ -197,9 +192,6 @@ menu_separator (menu); create_menu_item (menu, " Get Last Version ", TRUE, GTK_SIGNAL_FUNC (open_URL_from_widget), strdup (HOME_URL)); - - menu_separator (menu); - menu_separator (menu); } @@ -218,15 +210,14 @@ GtkWidget *menu_bar; GtkWidget *file_menu; GtkWidget *menu_item; - GtkAccelGroup *accel_ = /*gtk_accel_group_get_default */ gtk_accel_group_new (); + GtkAccelGroup *accel_ = gtk_accel_group_new (); + gtk_window_add_accel_group(GTK_WINDOW (gtk_widget_get_toplevel (vbox)), accel_); menu_bar = gtk_menu_bar_new (); gtk_box_pack_start (GTK_BOX (vbox), menu_bar, FALSE, TRUE, 0); gtk_widget_show (menu_bar); - - /* MESSAGE MENU */ file_menu = gtk_menu_item_new_with_label ("Message"); gtk_menu_bar_append (GTK_MENU_BAR (menu_bar), file_menu); @@ -243,10 +234,9 @@ menu_separator (menu); - create_menu_item (menu, " Send ", TRUE, GTK_SIGNAL_FUNC (send_send), NULL); + menu_item = create_menu_item (menu, " Send ", TRUE, GTK_SIGNAL_FUNC (send_send), NULL); + ACCEL (menu_item, 'S', GDK_CONTROL_MASK); - menu_separator (menu); - menu_separator (menu); @@ -274,10 +264,6 @@ menu_item = create_menu_item (menu, " Select All ", TRUE, GTK_SIGNAL_FUNC (text_select_all), send_text); ACCEL (menu_item, 'A', GDK_CONTROL_MASK); - menu_separator (menu); - menu_separator (menu); - - } /* EOF */ diff -u -r -N LinPopUp-1.2.0.orig/src/protos.h LinPopUp-1.2.0/src/protos.h --- LinPopUp-1.2.0.orig/src/protos.h Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/protos.h Wed Sep 11 21:35:14 2002 @@ -196,6 +196,7 @@ char self_send; char auto_iconify; char wrap_to_first; + char beep_new_message; int win_x; int win_y; int win_h; diff -u -r -N LinPopUp-1.2.0.orig/src/recept.c LinPopUp-1.2.0/src/recept.c --- LinPopUp-1.2.0.orig/src/recept.c Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/recept.c Wed Sep 11 21:35:14 2002 @@ -82,11 +82,16 @@ read_message (int message_number, struct linpopup_message *this_message) { int file_handle; + char *cP; file_handle = open (DATA_FILE, O_RDONLY, DATA_PERM); /* lock it for reading .. */ (void) lock_reg (file_handle, F_SETLKW, F_RDLCK, 0, SEEK_SET, 0); lseek (file_handle, (message_number - 1) * sizeof (*this_message), SEEK_SET); read (file_handle, this_message, sizeof (*this_message)); + while((cP = strchr(this_message->text, '\x14')) != NULL) + { + cP[0] = '\x0A'; + } /* unlock */ (void) lock_reg (file_handle, F_SETLK, F_UNLCK, 0, SEEK_SET, 0); close (file_handle); @@ -488,6 +493,9 @@ if (!are_there_new_messages_in_data_file ()) return TRUE; + if (user_rc.beep_new_message) + gdk_beep (); + processing_new_message = TRUE; show_message (first_new_message); processing_new_message = FALSE; diff -u -r -N LinPopUp-1.2.0.orig/src/send.c LinPopUp-1.2.0/src/send.c --- LinPopUp-1.2.0.orig/src/send.c Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/send.c Wed Sep 11 21:35:14 2002 @@ -489,6 +489,7 @@ /* -- and a text area via create_text defined in text.c -- */ create_text_area (send_text, send_vbox); gtk_text_set_editable (GTK_TEXT (send_text), 1); + gtk_widget_grab_focus (send_text); /* -- and finally a statusbar -- */ send_statusbar = gtk_statusbar_new (); diff -u -r -N LinPopUp-1.2.0.orig/src/text.c LinPopUp-1.2.0/src/text.c --- LinPopUp-1.2.0.orig/src/text.c Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/text.c Wed Sep 11 21:35:14 2002 @@ -84,15 +84,17 @@ //GtkWidget *hscrollbar; GtkWidget *vscrollbar; static GdkColor text_bg = { 0, 0xffec, 0xffec, 0xffec }; - GtkStyle *style; + GtkStyle *style, *parentStyle; table = gtk_table_new (2, 2, FALSE); gtk_table_attach (GTK_TABLE (table), this_text, 0, 1, 0, 1, GTK_FILL | GTK_EXPAND, GTK_FILL | GTK_EXPAND | GTK_SHRINK, 0, 0); gtk_widget_show (this_text); + parentStyle = gtk_widget_get_style(vbox); style = gtk_style_new (); style->base[GTK_STATE_NORMAL] = text_bg; + style->font = parentStyle->font; gtk_widget_set_style (GTK_WIDGET (this_text), style); /* diff -u -r -N LinPopUp-1.2.0.orig/src/toolbar.c LinPopUp-1.2.0/src/toolbar.c --- LinPopUp-1.2.0.orig/src/toolbar.c Tue Mar 14 03:45:05 2000 +++ LinPopUp-1.2.0/src/toolbar.c Wed Sep 11 21:35:14 2002 @@ -58,8 +58,9 @@ GtkWidget * create_toolbar (GtkWidget * window, GtkWidget * vbox) { - GtkWidget *toolbar; + GtkWidget *toolbar, *toolwidget; static GtkWidget *icon_new, *icon_reply, *icon_del, *icon_left, *icon_right, *icon_min; + GtkAccelGroup *accel_ = gtk_accel_group_get_default (); toolbar = gtk_toolbar_new (GTK_ORIENTATION_HORIZONTAL, user_rc.toolbar_style); @@ -98,7 +99,8 @@ gtk_toolbar_append_space (GTK_TOOLBAR (toolbar)); - gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), " Iconize ", " Iconize LinPopUp ", "", icon_min, GTK_SIGNAL_FUNC (iconify_window), GTK_WINDOW (window)); + toolwidget = gtk_toolbar_append_item (GTK_TOOLBAR (toolbar), " Iconize ", " Iconize LinPopUp ", "", icon_min, GTK_SIGNAL_FUNC (iconify_window), GTK_WINDOW (window)); + gtk_widget_add_accelerator (toolwidget, "clicked", accel_, 'I', GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); return toolbar; }