Enabled socket code on Windows.

Re-enabled the gtk_window_present() call for Windows to pop up the main window.
Enabled notification if file on disk has changed under Windows, it seems to work (closes #1557689).


git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@835 ea778897-0a13-0410-b9d1-a72fbfd435f5

ChangeLog

+2006-09-26  Enrico Tröger  <enrico.troeger@uvena.de>
+
+ * win32-config.h: Enabled socket code on Windows.
+ * src/socket.c: Re-enabled the gtk_window_present() call for Windows
+                 to pop up the main window.
+ * src/utils.c, src/sci_cb.c:
+   Enabled notification if file on disk has changed under Windows, it
+   seems to work (closes #1557689).
+
+
 2006-09-26  Frank Lanitz  <frank@frank.uvena.de>
 
  * po/nl.po, THANKS, configure.in, scr/about.c:

src/sci_cb.c

@@ -59,12 +59,10 @@ on_editor_button_press_event           (GtkWidget *widget,
 	gint idx = GPOINTER_TO_INT(user_data);
 	editor_info.click_pos = sci_get_position_from_xy(doc_list[idx].sci, event->x, event->y, FALSE);
 
-#ifndef G_OS_WIN32
 	if (event->button == 1)
 	{
 		return utils_check_disk_status(idx);
 	}
-#endif
 
 	if (event->button == 3)
 	{
@@ -1397,12 +1395,12 @@ void sci_cb_do_comment_toggle(gint idx)
 					real_uncomment_multiline(idx);
 					count_uncommented++;
 				}
-				else 
+				else
 				{
 					real_comment_multiline(idx, line_start, last_line);
 					count_commented++;
 				}
-				
+
 				// break because we are already on the last line
 				break_loop = TRUE;
 				break;
@@ -1437,7 +1435,7 @@ void sci_cb_do_comment_toggle(gint idx)
 				sci_set_selection_start(doc_list[idx].sci, sel_start - co_len - eol_len);
 				sci_set_selection_end(doc_list[idx].sci, sel_end - co_len - eol_len);
 			}
-			else 
+			else
 			{
 				sci_set_selection_start(doc_list[idx].sci, sel_start + co_len + eol_len);
 				sci_set_selection_end(doc_list[idx].sci, sel_end + co_len + eol_len);

src/socket.c

@@ -356,6 +356,9 @@ gboolean socket_lock_input_cb(GIOChannel *source, GIOCondition condition, gpoint
 				geany_debug("got data from socket, but it does not look like a filename");
 		}
 		gtk_window_deiconify(GTK_WINDOW(app->window));
+#ifdef G_OS_WIN32
+		gtk_window_present(GTK_WINDOW(app->window));
+#endif
 	}
 
 	socket_fd_close(sock);

src/utils.c

@@ -481,7 +481,6 @@ gchar *utils_find_open_xml_tag(const gchar sel[], gint size, gboolean check_tag)
 
 gboolean utils_check_disk_status(gint idx)
 {
-#ifndef G_OS_WIN32
 	struct stat st;
 	time_t t;
 	gchar *locale_filename;
@@ -519,7 +518,6 @@ gboolean utils_check_disk_status(gint idx)
 		g_free(basename);
 		return TRUE; //file has changed
 	}
-#endif
 	return FALSE;
 }
 

win32-config.h

@@ -286,7 +286,7 @@
 /* #undef TM_IN_SYS_TIME */
 
 /* Version number of package */
-#define VERSION "0.8"
+#define VERSION "0.9"
 
 /* Define to empty if `const' does not conform to ANSI C. */
 /* #undef const */
@@ -320,3 +320,6 @@
 /* #undef volatile */
 
 #define REVISION "SVN"
+
+/* Define if you want to detect a running instance */
+#define HAVE_SOCKET 1