X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=gtk-gui.c;h=acaa9c4f6a2510d3a57d265550fcb77b6a296d37;hb=565736a471e9ba66cbc68ce76c90d5e0c2fa57cf;hp=eae080808c457612c290dac870c6a78cca53ad5d;hpb=001f6d05dca762de232c68b7ff10fdc999a61514;p=ext%2Fsubsurface.git

diff --git a/gtk-gui.c b/gtk-gui.c
index eae0808..acaa9c4 100644
--- a/gtk-gui.c
+++ b/gtk-gui.c
@@ -523,11 +523,7 @@ static void about_dialog(GtkWidget *w, gpointer data)
 	GdkPixbuf *logo = NULL;
 
 	if (need_icon) {
-#if defined __linux__ || defined __APPLE__
-		GtkWidget *image = gtk_image_new_from_file("subsurface.svg");
-#elif defined WIN32
-		GtkWidget *image = gtk_image_new_from_file("subsurface.ico");
-#endif
+		GtkWidget *image = gtk_image_new_from_file(subsurface_icon_name());
 
 		if (image) {
 			logo = gtk_image_get_pixbuf(GTK_IMAGE(image));
@@ -703,11 +699,7 @@ void init_ui(int *argcp, char ***argvp)
 		}
 	}
 	if (need_icon)
-#if defined __linux__ || defined __APPLE__
-		gtk_window_set_icon_from_file(GTK_WINDOW(win), "subsurface.svg", NULL);
-#elif defined WIN32
-		gtk_window_set_icon_from_file(GTK_WINDOW(win), "subsurface.ico", NULL);
-#endif
+		gtk_window_set_icon_from_file(GTK_WINDOW(win), subsurface_icon_name(), NULL);
 	g_signal_connect(G_OBJECT(win), "delete-event", G_CALLBACK(on_delete), NULL);
 	g_signal_connect(G_OBJECT(win), "destroy", G_CALLBACK(on_destroy), NULL);
 	main_window = win;
@@ -858,7 +850,7 @@ int process_ui_events(void)
 			break;
 		}
 	}
-	return(ret);
+	return ret;
 }
 
 
@@ -913,7 +905,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);
 }