Revision: 3632 http://geany.svn.sourceforge.net/geany/?rev=3632&view=rev Author: eht16 Date: 2009-03-16 14:41:10 +0000 (Mon, 16 Mar 2009)
Log Message: ----------- Don't present the main window of a running instance when starting a second instance separately.
Modified Paths: -------------- trunk/ChangeLog trunk/src/socket.c
Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2009-03-16 14:03:20 UTC (rev 3631) +++ trunk/ChangeLog 2009-03-16 14:41:10 UTC (rev 3632) @@ -8,6 +8,9 @@ * src/ui_uitls.c: Fix wrong directory selection behaviour in all Open Folder dialogs (closes #2688020, patch by Marcel Stimberg, thanks). + * src/socket.c: + Don't present the main window of a running instance when starting + a second instance separately.
2009-03-15 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
Modified: trunk/src/socket.c =================================================================== --- trunk/src/socket.c 2009-03-16 14:03:20 UTC (rev 3631) +++ trunk/src/socket.c 2009-03-16 14:41:10 UTC (rev 3632) @@ -512,6 +512,7 @@ struct sockaddr_in caddr; guint caddr_len = sizeof(caddr); GtkWidget *window = data; + gboolean popup = FALSE;
fd = g_io_channel_unix_get_fd(source); sock = accept(fd, (struct sockaddr *)&caddr, &caddr_len); @@ -525,6 +526,7 @@ { handle_input_filename(g_strstrip(buf)); } + popup = TRUE; } else if (strncmp(buf, "line", 4) == 0) { @@ -552,10 +554,13 @@ } #endif } - gtk_window_present(GTK_WINDOW(window)); + if (popup) + { + gtk_window_present(GTK_WINDOW(window)); #ifdef G_OS_WIN32 - gdk_window_show(window->window); + gdk_window_show(window->window); #endif + }
socket_fd_close(sock);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.