diff options
| author |  Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 18:19:48 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-14 18:19:48 -0800 |
| commit | b0759feef87fcf820682cb36d65f2252c2cc12ae (patch) | |
| tree | 4767b4ac0f5222c1500cb1f0826b94e87fd4b6b0 /gtk-gui.c | |
| parent | df12fcf310d97ba7244755c687c6119da17928e2 (diff) | |
| parent | 6245b700a4a98cc2dba8c5b8c3f4958491605755 (diff) | |
| download | subsurface-b0759feef87fcf820682cb36d65f2252c2cc12ae.tar.gz | |
Merge branch 'forlinus' of git://git.hohndel.org/subsurface
* 'forlinus' of git://git.hohndel.org/subsurface:
Improve Makefile for MacOS
Add reasonable default device names for divecomputer import
More intuitive label for "not saving" when exiting
Diffstat (limited to 'gtk-gui.c')
| -rw-r--r-- | gtk-gui.c | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -162,7 +162,7 @@ static void ask_save_changes() dialog = gtk_dialog_new_with_buttons("Save Changes?", GTK_WINDOW(main_window), GTK_DIALOG_MODAL | GTK_DIALOG_DESTROY_WITH_PARENT, GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + GTK_STOCK_NO, GTK_RESPONSE_NO, NULL); content = gtk_dialog_get_content_area (GTK_DIALOG (dialog)); label = gtk_label_new ("You have unsaved changes\nWould you like to save those before exiting the program?"); @@ -913,7 +913,7 @@ static GtkEntry *dive_computer_device(GtkWidget *vbox) entry = gtk_entry_new(); gtk_container_add(GTK_CONTAINER(frame), entry); - gtk_entry_set_text(GTK_ENTRY(entry), "/dev/ttyUSB0"); + gtk_entry_set_text(GTK_ENTRY(entry), subsurface_USB_name()); return GTK_ENTRY(entry); } |