Revision: 4507
http://geany.svn.sourceforge.net/geany/?rev=4507&view=rev
Author: frlan
Date: 2009-12-26 14:13:35 +0000 (Sat, 26 Dec 2009)
Log Message:
-----------
Fix a minor typo inside plugin API reference.
Modified Paths:
--------------
trunk/ChangeLog
trunk/doc/plugins.dox
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-20 21:51:42 UTC (rev 4506)
+++ trunk/ChangeLog 2009-12-26 14:13:35 UTC (rev 4507)
@@ -1,3 +1,9 @@
+2009-12-26 Frank Lanitz <frank(a)frank.uvena.de>
+
+ * doc/plugins.dox:
+ Fix a minor typo inside plugin API reference.
+
+
2009-12-20 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
* src/dialog.c, src/dialogs.h, src/document.c, src/prefs.c:
Modified: trunk/doc/plugins.dox
===================================================================
--- trunk/doc/plugins.dox 2009-12-20 21:51:42 UTC (rev 4506)
+++ trunk/doc/plugins.dox 2009-12-26 14:13:35 UTC (rev 4507)
@@ -152,7 +152,7 @@
* Sent after the filetype of a document has been changed.
* The previous filetype object is passed but it can be NULL (e.g. at startup).
* The new filetype can be read with: @code
- * GeanyFiletype *ft = doc->filetype;
+ * GeanyFiletype *ft = doc->file_type;
* @endcode
*
* @param obj a GeanyObject instance, should be ignored.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4506
http://geany.svn.sourceforge.net/geany/?rev=4506&view=rev
Author: eht16
Date: 2009-12-20 21:51:42 +0000 (Sun, 20 Dec 2009)
Log Message:
-----------
Future Geany Windows builds will be based on GTK 2.18.
Modified Paths:
--------------
trunk/geany.nsi
Modified: trunk/geany.nsi
===================================================================
--- trunk/geany.nsi 2009-12-20 21:49:23 UTC (rev 4505)
+++ trunk/geany.nsi 2009-12-20 21:51:42 UTC (rev 4506)
@@ -196,7 +196,7 @@
; Include GTK runtime library but only if desired from command line
!ifdef INCLUDE_GTK
-Section "GTK 2.16 Runtime Environment" SEC06
+Section "GTK 2.18 Runtime Environment" SEC06
SectionIn 1
SetOverwrite ifnewer
SetOutPath "$INSTDIR\bin"
@@ -303,7 +303,7 @@
!insertmacro MUI_DESCRIPTION_TEXT ${SEC04} "Manual in Text and HTML format."
!insertmacro MUI_DESCRIPTION_TEXT ${SEC05} "Symbol lists necessary for auto completion of symbols."
!ifdef INCLUDE_GTK
-!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.8 or higher), you can skip it."
+!insertmacro MUI_DESCRIPTION_TEXT ${SEC06} "You need these files to run Geany. If you have already installed a GTK Runtime Environment (2.18 or higher), you can skip it."
!endif
!insertmacro MUI_DESCRIPTION_TEXT ${SEC07} "Add context menu item 'Open With Geany'"
!insertmacro MUI_DESCRIPTION_TEXT ${SEC08} "Create shortcuts for Geany on the desktop and in the Quicklaunch Bar"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4504
http://geany.svn.sourceforge.net/geany/?rev=4504&view=rev
Author: eht16
Date: 2009-12-20 21:03:28 +0000 (Sun, 20 Dec 2009)
Log Message:
-----------
Rename win32_show_project_folder_dialog() to win32_show_folder_dialog() as it is not related and not used by any project management related code.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/ui_utils.c
trunk/src/win32.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-20 20:49:28 UTC (rev 4503)
+++ trunk/ChangeLog 2009-12-20 21:03:28 UTC (rev 4504)
@@ -25,6 +25,10 @@
* src/callbacks.c, src/prefs.c, src/toolbar.c, src/toolbar.h:
Set the correct parent window for the toolbar editor
dialog (closes #2913334).
+ * src/win32.c, src/win32.h, src/ui_utils.c:
+ Rename win32_show_project_folder_dialog() to
+ win32_show_folder_dialog() as it is not related and not used by any
+ project management related code.
2009-12-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/ui_utils.c
===================================================================
--- trunk/src/ui_utils.c 2009-12-20 20:49:28 UTC (rev 4503)
+++ trunk/src/ui_utils.c 2009-12-20 21:03:28 UTC (rev 4504)
@@ -1662,7 +1662,7 @@
if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
{
#ifdef G_OS_WIN32
- utf8_path = win32_show_project_folder_dialog(ui_widgets.prefs_dialog, title,
+ utf8_path = win32_show_folder_dialog(ui_widgets.prefs_dialog, title,
gtk_entry_get_text(GTK_ENTRY(entry)));
#else
utf8_path = run_file_chooser(title, action, gtk_entry_get_text(GTK_ENTRY(entry)));
Modified: trunk/src/win32.c
===================================================================
--- trunk/src/win32.c 2009-12-20 20:49:28 UTC (rev 4503)
+++ trunk/src/win32.c 2009-12-20 21:03:28 UTC (rev 4504)
@@ -208,8 +208,7 @@
/* Shows a folder selection dialog.
* initial_dir is expected in UTF-8
* The selected folder name is returned. */
-gchar *win32_show_project_folder_dialog(GtkWidget *parent, const gchar *title,
- const gchar *initial_dir)
+gchar *win32_show_folder_dialog(GtkWidget *parent, const gchar *title, const gchar *initial_dir)
{
BROWSEINFOW bi;
LPCITEMIDLIST pidl;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4501
http://geany.svn.sourceforge.net/geany/?rev=4501&view=rev
Author: eht16
Date: 2009-12-20 20:29:45 +0000 (Sun, 20 Dec 2009)
Log Message:
-----------
Mark the document only as changed if it is not closed afterwards.
Prevent possible segfaults if the document was closed when it is missing from the filesystem.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-20 20:07:52 UTC (rev 4500)
+++ trunk/ChangeLog 2009-12-20 20:29:45 UTC (rev 4501)
@@ -12,6 +12,9 @@
* src/document.c:
When closing a document after it was deleted from the filesystem,
don't ask whether it should be saved first.
+ Mark the document only as changed if it is not closed afterwards.
+ Prevent possible segfaults if the document was closed when it is
+ missing from the filesystem.
* src/keybindings.c, src/keyfile.c, src/main.c, src/msgwindow.c,
src/msgwindow.h, src/prefs.c:
Add MessageWindow::scribble and use it instead of searching the
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2009-12-20 20:07:52 UTC (rev 4500)
+++ trunk/src/document.c 2009-12-20 20:29:45 UTC (rev 4501)
@@ -2948,11 +2948,6 @@
gboolean want_reload = FALSE;
gint ret;
- /* file is missing - set unsaved state */
- document_set_text_changed(doc, TRUE);
- /* don't prompt more than once */
- setptr(doc->real_path, NULL);
-
ret = dialogs_show_prompt(NULL,
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
@@ -2966,9 +2961,15 @@
}
else if (ret == GTK_RESPONSE_CLOSE)
{
- doc->changed = FALSE;
document_close(doc);
}
+ if (ret != GTK_RESPONSE_CLOSE)
+ {
+ /* file is missing - set unsaved state */
+ document_set_text_changed(doc, TRUE);
+ /* don't prompt more than once */
+ setptr(doc->real_path, NULL);
+ }
return want_reload;
}
@@ -3027,11 +3028,13 @@
}
g_free(locale_filename);
- old_status = doc->priv->file_disk_status;
- doc->priv->file_disk_status = FILE_OK;
- if (old_status != doc->priv->file_disk_status)
- ui_update_tab_status(doc);
-
+ if (DOC_VALID(doc))
+ { /* doc can get invalid when a document was closed by monitor_resave_missing_file() */
+ old_status = doc->priv->file_disk_status;
+ doc->priv->file_disk_status = FILE_OK;
+ if (old_status != doc->priv->file_disk_status)
+ ui_update_tab_status(doc);
+ }
return ret;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
Revision: 4498
http://geany.svn.sourceforge.net/geany/?rev=4498&view=rev
Author: eht16
Date: 2009-12-20 15:50:53 +0000 (Sun, 20 Dec 2009)
Log Message:
-----------
When closing a document after it was deleted from the filesystem, don't ask whether it should be saved first.
Modified Paths:
--------------
trunk/ChangeLog
trunk/src/document.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2009-12-20 15:49:31 UTC (rev 4497)
+++ trunk/ChangeLog 2009-12-20 15:50:53 UTC (rev 4498)
@@ -9,6 +9,9 @@
* src/editor.c:
Fix LaTeX environment auto completion with CR/LF line endings.
Add some sanity checks.
+ * src/document.c:
+ When closing a document after it was deleted from the filesystem,
+ don't ask whether it should be saved first.
2009-12-20 Frank Lanitz <frank(at)frank(dot)uvena(dot)de>
Modified: trunk/src/document.c
===================================================================
--- trunk/src/document.c 2009-12-20 15:49:31 UTC (rev 4497)
+++ trunk/src/document.c 2009-12-20 15:50:53 UTC (rev 4498)
@@ -2966,6 +2966,7 @@
}
else if (ret == GTK_RESPONSE_CLOSE)
{
+ doc->changed = FALSE;
document_close(doc);
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.