Commits September 2011

commits@lists.geany.org

5 participants
71 discussions

SF.net SVN: geany:[5946] trunk
by ntrel＠users.sourceforge.net 22 Sep '11

22 Sep '11

Revision: 5946 http://geany.svn.sourceforge.net/geany/?rev=5946&view=rev Author: ntrel Date: 2011-09-22 15:53:14 +0000 (Thu, 22 Sep 2011) Log Message: ----------- Fix \0 char in format string - save as dialog filter bug. Modified Paths: -------------- trunk/ChangeLog trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-09-22 12:05:05 UTC (rev 5945) +++ trunk/ChangeLog 2011-09-22 15:53:14 UTC (rev 5946) @@ -2,6 +2,8 @@ * src/stash.c, src/keyfile.c, src/keyfile.h, src/ui_utils.c: Add configuration_add_various_pref_group(). + * src/win32.c: + Fix \0 char in format string - save as dialog filter bug. 2011-09-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2011-09-22 12:05:05 UTC (rev 5945) +++ trunk/src/win32.c 2011-09-22 15:53:14 UTC (rev 5946) @@ -121,11 +121,8 @@ /* replace all "\t"s by \0 */ len = strlen(string); - for (i = 0; i < len; i++) - { - if (string[i] == '\t') - string[i] = '\0'; - } + g_strdelimit(string, "\t", '\0'); + g_assert(string[len - 1] == 0x0); MultiByteToWideChar(CP_UTF8, 0, string, len, title, sizeof(title)); g_free(string); @@ -140,9 +137,11 @@ gchar *filter; /* create meta file filter "All files" */ - filter = g_strdup_printf("%s\0*\0", _("All files")); + filter = g_strdup_printf("%s\t*\t", _("All files")); - len = strlen(_("All files")) + 3; + len = strlen(filter); + g_strdelimit(filter, "\t", '\0'); + g_assert(filter[len - 1] == 0x0); MultiByteToWideChar(CP_UTF8, 0, filter, len, title, sizeof(title)); g_free(filter); @@ -153,7 +152,7 @@ static wchar_t *get_filters(gboolean project_files) { gchar *string; - gint i, len; + gint len; static wchar_t title[1024]; if (project_files) @@ -171,10 +170,8 @@ /* replace all "\t"s by \0 */ len = strlen(string); - for (i = 0; i < len; i++) - { - if (string[i] == '\t') string[i] = '\0'; - } + g_strdelimit(string, "\t", '\0'); + g_assert(string[len - 1] == 0x0); MultiByteToWideChar(CP_UTF8, 0, string, len, title, sizeof(title)); g_free(string); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5945] trunk/src/dialogs.c
by ntrel＠users.sourceforge.net 22 Sep '11

22 Sep '11

Revision: 5945 http://geany.svn.sourceforge.net/geany/?rev=5945&view=rev Author: ntrel Date: 2011-09-22 12:05:05 +0000 (Thu, 22 Sep 2011) Log Message: ----------- Fix string literal comparison warning. Modified Paths: -------------- trunk/src/dialogs.c Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2011-09-22 11:52:58 UTC (rev 5944) +++ trunk/src/dialogs.c 2011-09-22 12:05:05 UTC (rev 5945) @@ -1588,7 +1588,7 @@ #ifdef G_OS_WIN32 /* our native dialog code doesn't support custom buttons */ - if (btn_3 == GTK_STOCK_YES && btn_2 == GTK_STOCK_NO && btn_1 == NULL) + if (btn_3 == (gchar*)GTK_STOCK_YES && btn_2 == (gchar*)GTK_STOCK_NO && btn_1 == NULL) { gchar *string = (extra_text == NULL) ? g_strdup(question_text) : g_strconcat(question_text, "\n\n", extra_text, NULL); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5944] trunk
by ntrel＠users.sourceforge.net 22 Sep '11

22 Sep '11

Revision: 5944 http://geany.svn.sourceforge.net/geany/?rev=5944&view=rev Author: ntrel Date: 2011-09-22 11:52:58 +0000 (Thu, 22 Sep 2011) Log Message: ----------- Add configuration_add_various_pref_group(). Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c trunk/src/keyfile.h trunk/src/stash.c trunk/src/ui_utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-09-21 16:03:11 UTC (rev 5943) +++ trunk/ChangeLog 2011-09-22 11:52:58 UTC (rev 5944) @@ -1,3 +1,9 @@ +2011-09-22 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/stash.c, src/keyfile.c, src/keyfile.h, src/ui_utils.c: + Add configuration_add_various_pref_group(). + + 2011-09-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/keyfile.c: Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2011-09-21 16:03:11 UTC (rev 5943) +++ trunk/src/keyfile.c 2011-09-22 11:52:58 UTC (rev 5944) @@ -110,6 +110,14 @@ } +/* The group will be free'd on quitting. */ +void configuration_add_various_pref_group(struct StashGroup *group) +{ + configuration_add_pref_group(group, TRUE); + stash_group_set_various(group, TRUE); +} + + static void init_pref_groups(void) { StashGroup *group; @@ -183,8 +191,7 @@ /* various geany prefs */ group = stash_group_new(PACKAGE); - configuration_add_pref_group(group, TRUE); - stash_group_set_various(group, TRUE); + configuration_add_various_pref_group(group); stash_group_add_boolean(group, &editor_prefs.show_scrollbars, "show_editor_scrollbars", TRUE); @@ -210,8 +217,7 @@ /* various build-menu prefs */ group = stash_group_new("build-menu"); - configuration_add_pref_group(group, TRUE); - stash_group_set_various(group, TRUE); + configuration_add_various_pref_group(group); stash_group_add_integer(group, &build_menu_prefs.number_ft_menu_items, "number_ft_menu_items", 0); Modified: trunk/src/keyfile.h =================================================================== --- trunk/src/keyfile.h 2011-09-21 16:03:11 UTC (rev 5943) +++ trunk/src/keyfile.h 2011-09-22 11:52:58 UTC (rev 5944) @@ -37,6 +37,8 @@ void configuration_add_pref_group(struct StashGroup *group, gboolean for_prefs_dialog); +void configuration_add_various_pref_group(struct StashGroup *group); + void configuration_save(void); gboolean configuration_load(void); Modified: trunk/src/stash.c =================================================================== --- trunk/src/stash.c 2011-09-21 16:03:11 UTC (rev 5943) +++ trunk/src/stash.c 2011-09-22 11:52:58 UTC (rev 5944) @@ -360,8 +360,7 @@ } -/* Useful so the user can edit the keyfile manually while the program is running, - * and the setting won't be overridden. +/* Used for selecting groups passed to stash_tree_setup(). * @c FALSE by default. */ void stash_group_set_various(StashGroup *group, gboolean various) { Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2011-09-21 16:03:11 UTC (rev 5943) +++ trunk/src/ui_utils.c 2011-09-22 11:52:58 UTC (rev 5944) @@ -2066,8 +2066,7 @@ StashGroup *group = stash_group_new(PACKAGE); /* various prefs */ - configuration_add_pref_group(group, TRUE); - stash_group_set_various(group, TRUE); + configuration_add_various_pref_group(group); stash_group_add_boolean(group, &interface_prefs.show_symbol_list_expanders, "show_symbol_list_expanders", TRUE); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5943] trunk/src/prefs.c
by ntrel＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 5943 http://geany.svn.sourceforge.net/geany/?rev=5943&view=rev Author: ntrel Date: 2011-09-21 16:03:11 +0000 (Wed, 21 Sep 2011) Log Message: ----------- Use various_treeview global to tidy code a little. Modified Paths: -------------- trunk/src/prefs.c Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2011-09-21 15:50:36 UTC (rev 5942) +++ trunk/src/prefs.c 2011-09-21 16:03:11 UTC (rev 5943) @@ -74,12 +74,15 @@ GeanyToolPrefs tool_prefs; +/* keybinding globals, should be put in a struct */ static GtkTreeIter g_iter; static GtkTreeStore *store = NULL; static GtkTreeView *tree = NULL; static GtkWidget *dialog_label; static gboolean edited = FALSE; +static GtkTreeView *various_treeview = NULL; + static void kb_cell_edited_cb(GtkCellRendererText *cellrenderertext, gchar *path, gchar *new_text, gpointer user_data); static gboolean kb_grab_key_dialog_key_press_cb(GtkWidget *dialog, GdkEventKey *event, gpointer user_data); static void kb_grab_key_dialog_response_cb(GtkWidget *dialog, gint response, gpointer user_data); @@ -109,7 +112,6 @@ { StashGroup *group; guint i; - GtkWidget *widget = ui_lookup_widget(ui_widgets.prefs_dialog, "various_treeview"); foreach_ptr_array(group, i, pref_groups) { @@ -127,10 +129,10 @@ switch (action) { case PREF_DISPLAY: - stash_tree_display(pref_groups, GTK_TREE_VIEW(widget)); + stash_tree_display(pref_groups, various_treeview); break; case PREF_UPDATE: - stash_tree_update(pref_groups, GTK_TREE_VIEW(widget)); + stash_tree_update(pref_groups, various_treeview); break; } } @@ -1615,7 +1617,7 @@ if (ui_widgets.prefs_dialog == NULL) { GtkWidget *combo_new, *combo_open, *combo_eol; - GtkWidget *label, *various_tree; + GtkWidget *label; guint i; gchar *encoding_string; GdkPixbuf *pb; @@ -1699,8 +1701,9 @@ } /* page Various */ - various_tree = ui_lookup_widget(ui_widgets.prefs_dialog, "various_treeview"); - stash_tree_setup(pref_groups, GTK_TREE_VIEW(various_tree)); + various_treeview = GTK_TREE_VIEW(ui_lookup_widget(ui_widgets.prefs_dialog, + "various_treeview")); + stash_tree_setup(pref_groups, various_treeview); #ifdef HAVE_VTE vte_append_preferences_tab(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5942] trunk
by ntrel＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 5942 http://geany.svn.sourceforge.net/geany/?rev=5942&view=rev Author: ntrel Date: 2011-09-21 15:50:36 +0000 (Wed, 21 Sep 2011) Log Message: ----------- Fix making various prefs tree sync with data values when showing the prefs dialog (patch by Dimitar Zhekov, thanks). Modified Paths: -------------- trunk/ChangeLog trunk/src/prefs.c trunk/src/stash.c trunk/src/stash.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-09-21 15:35:38 UTC (rev 5941) +++ trunk/ChangeLog 2011-09-21 15:50:36 UTC (rev 5942) @@ -4,6 +4,9 @@ Rename use_safe_file_saving various pref to use_atomic_file_saving as it's not 'safe'. Use old pref if new one is missing for compatibility with Geany <= 0.20. + * src/prefs.c, src/stash.h, src/stash.c: + Fix making various prefs tree sync with data values when showing + the prefs dialog (patch by Dimitar Zhekov, thanks). 2011-09-17 Frank Lanitz <frlan(a)frank.uvena.de> Modified: trunk/src/prefs.c =================================================================== --- trunk/src/prefs.c 2011-09-21 15:35:38 UTC (rev 5941) +++ trunk/src/prefs.c 2011-09-21 15:50:36 UTC (rev 5942) @@ -109,6 +109,7 @@ { StashGroup *group; guint i; + GtkWidget *widget = ui_lookup_widget(ui_widgets.prefs_dialog, "various_treeview"); foreach_ptr_array(group, i, pref_groups) { @@ -123,10 +124,14 @@ } } - if (action == PREF_UPDATE) + switch (action) { - GtkWidget *widget = ui_lookup_widget(ui_widgets.prefs_dialog, "various_treeview"); - stash_tree_update(pref_groups, GTK_TREE_VIEW(widget)); + case PREF_DISPLAY: + stash_tree_display(pref_groups, GTK_TREE_VIEW(widget)); + break; + case PREF_UPDATE: + stash_tree_update(pref_groups, GTK_TREE_VIEW(widget)); + break; } } Modified: trunk/src/stash.c =================================================================== --- trunk/src/stash.c 2011-09-21 15:35:38 UTC (rev 5941) +++ trunk/src/stash.c 2011-09-21 15:50:36 UTC (rev 5942) @@ -1008,10 +1008,11 @@ } -typedef void (*stash_foreach_pref_func)(StashGroup *group, StashPref *entry, gpointer user_data); +typedef void (*stash_foreach_pref_func)(StashGroup *group, StashPref *entry, gpointer container, + PrefAction action); static void stash_foreach_various_pref(GPtrArray *group_array, stash_foreach_pref_func pref_func, - gpointer user_data) + gpointer container, PrefAction action) { StashGroup *group; guint i; @@ -1022,39 +1023,22 @@ if (group->various) { foreach_array(StashPref, entry, group->entries) - pref_func(group, entry, user_data); + pref_func(group, entry, container, action); } } } -static void stash_tree_append_pref(StashGroup *group, StashPref *entry, GtkListStore *store) +static void stash_tree_append_pref(StashGroup *group, StashPref *entry, GtkListStore *store, + PrefAction action) { - gpointer setting; GtkTreeIter iter; StashTreeValue *value; - switch (entry->setting_type) - { - case G_TYPE_BOOLEAN: - setting = GINT_TO_POINTER(*(gboolean *) entry->setting); - break; - case G_TYPE_INT: - setting = GINT_TO_POINTER(*(gint *) entry->setting); - break; - case G_TYPE_STRING: - setting = g_strdup(*(gchararray *) entry->setting); - break; - default: - g_warning("Unhandled type for %s::%s in %s()!", group->name, - entry->key_name, G_STRFUNC); - return; - } - value = g_new(StashTreeValue, 1); value->setting_type = entry->setting_type; - value->setting = setting; + value->setting = NULL; value->key_name = entry->key_name; value->group_name = group->name; @@ -1077,7 +1061,7 @@ store = gtk_list_store_new(STASH_TREE_COUNT, G_TYPE_STRING, G_TYPE_POINTER); stash_foreach_various_pref(group_array, - (stash_foreach_pref_func) stash_tree_append_pref, store); + (stash_foreach_pref_func) stash_tree_append_pref, store, PREF_DISPLAY); gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store), STASH_TREE_NAME, GTK_SORT_ASCENDING); @@ -1120,14 +1104,62 @@ } +static void stash_tree_display_pref(StashTreeValue *value, StashPref *entry) +{ + switch (entry->setting_type) + { + case G_TYPE_BOOLEAN: + value->setting = GINT_TO_POINTER(*(gboolean *) entry->setting); + break; + case G_TYPE_INT: + value->setting = GINT_TO_POINTER(*(gint *) entry->setting); + break; + case G_TYPE_STRING: + { + g_free(value->setting); + value->setting = g_strdup(*(gchararray *) entry->setting); + break; + } + default: + g_warning("Unhandled type for %s::%s in %s()!", value->group_name, + entry->key_name, G_STRFUNC); + } +} + + +static void stash_tree_update_pref(StashTreeValue *value, StashPref *entry) +{ + gpointer *setting = value->setting; + + switch (entry->setting_type) + { + case G_TYPE_BOOLEAN: + *(gboolean *) entry->setting = GPOINTER_TO_INT(setting); + break; + case G_TYPE_INT: + *(gint *) entry->setting = GPOINTER_TO_INT(setting); + break; + case G_TYPE_STRING: + { + gchararray *text = entry->setting; + g_free(*text); + *text = g_strdup((gchararray) setting); + break; + } + default: + g_warning("Unhandled type for %s::%s in %s()!", value->group_name, + value->key_name, G_STRFUNC); + } +} + /* These functions can handle about 200 settings on a 1GHz x86 CPU in ~0.06 seconds. * For 250+ settings, you'd better write something more efficient. */ -static void stash_tree_update_pref(StashGroup *group, StashPref *entry, GtkTreeModel *model) +static void stash_tree_handle_pref(StashGroup *group, StashPref *entry, GtkTreeModel *model, + PrefAction action) { GtkTreeIter iter; gboolean valid = gtk_tree_model_get_iter_first(model, &iter); StashTreeValue *value; - gpointer *setting; while (valid) { @@ -1136,23 +1168,14 @@ if (strcmp(group->name, value->group_name) == 0 && strcmp(entry->key_name, value->key_name) == 0) { - setting = value->setting; - - switch (entry->setting_type) + switch (action) { - case G_TYPE_BOOLEAN: - *(gboolean *) entry->setting = GPOINTER_TO_INT(setting); + case PREF_DISPLAY: + stash_tree_display_pref(value, entry); break; - case G_TYPE_INT: - *(gint *) entry->setting = GPOINTER_TO_INT(setting); + case PREF_UPDATE: + stash_tree_update_pref(value, entry); break; - case G_TYPE_STRING: - { - gchararray *text = entry->setting; - g_free(*text); - *text = g_strdup((gchararray) setting); - break; - } } break; @@ -1163,8 +1186,15 @@ } +void stash_tree_display(GPtrArray *group_array, GtkTreeView *tree) +{ + stash_foreach_various_pref(group_array, (stash_foreach_pref_func) stash_tree_handle_pref, + gtk_tree_view_get_model(tree), PREF_DISPLAY); +} + + void stash_tree_update(GPtrArray *group_array, GtkTreeView *tree) { - stash_foreach_various_pref(group_array, (stash_foreach_pref_func) stash_tree_update_pref, - gtk_tree_view_get_model(tree)); + stash_foreach_various_pref(group_array, (stash_foreach_pref_func) stash_tree_handle_pref, + gtk_tree_view_get_model(tree), PREF_UPDATE); } Modified: trunk/src/stash.h =================================================================== --- trunk/src/stash.h 2011-09-21 15:35:38 UTC (rev 5941) +++ trunk/src/stash.h 2011-09-21 15:50:36 UTC (rev 5942) @@ -94,6 +94,8 @@ void stash_tree_setup(GPtrArray *group_array, GtkTreeView *tree); +void stash_tree_display(GPtrArray *group_array, GtkTreeView *tree); + void stash_tree_update(GPtrArray *group_array, GtkTreeView *tree); #endif This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5941] branches/unstable
by ntrel＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 5941 http://geany.svn.sourceforge.net/geany/?rev=5941&view=rev Author: ntrel Date: 2011-09-21 15:35:38 +0000 (Wed, 21 Sep 2011) Log Message: ----------- Use GTK unsaved file dialog on Windows too because the button names should be specific. Modified Paths: -------------- branches/unstable/ChangeLog branches/unstable/src/dialogs.c branches/unstable/src/win32.c branches/unstable/src/win32.h Modified: branches/unstable/ChangeLog =================================================================== --- branches/unstable/ChangeLog 2011-09-21 13:47:37 UTC (rev 5940) +++ branches/unstable/ChangeLog 2011-09-21 15:35:38 UTC (rev 5941) @@ -3,6 +3,9 @@ * src/build.c: Use #ifdef SYNC_SPAWN instead of G_OS_WIN32 for easier testing with glib's asynchronous spawning (currently doesn't work on Windows). + * src/win32.c, src/win32.h, src/dialogs.c: + Use GTK unsaved file dialog on Windows too because the button names + should be specific. 2011-09-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> Modified: branches/unstable/src/dialogs.c =================================================================== --- branches/unstable/src/dialogs.c 2011-09-21 13:47:37 UTC (rev 5940) +++ branches/unstable/src/dialogs.c 2011-09-21 15:35:38 UTC (rev 5941) @@ -804,7 +804,6 @@ } -#ifndef G_OS_WIN32 static gint run_unsaved_dialog(const gchar *msg, const gchar *msg2) { GtkWidget *dialog, *button; @@ -812,6 +811,7 @@ dialog = gtk_message_dialog_new(GTK_WINDOW(main_widgets.window), GTK_DIALOG_DESTROY_WITH_PARENT, GTK_MESSAGE_QUESTION, GTK_BUTTONS_NONE, "%s", msg); + gtk_window_set_title(GTK_WINDOW(dialog), _("Question")); gtk_message_dialog_format_secondary_text(GTK_MESSAGE_DIALOG(dialog), "%s", msg2); gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL); @@ -828,7 +828,6 @@ return ret; } -#endif gboolean dialogs_show_unsaved_file(GeanyDocument *doc) @@ -851,12 +850,7 @@ msg2 = _("Do you want to save it before closing?"); g_free(short_fn); -#ifdef G_OS_WIN32 - setptr(msg, g_strconcat(msg, "\n", msg2, NULL)); - ret = win32_message_dialog_unsaved(msg); -#else ret = run_unsaved_dialog(msg, msg2); -#endif g_free(msg); switch (ret) Modified: branches/unstable/src/win32.c =================================================================== --- branches/unstable/src/win32.c 2011-09-21 13:47:37 UTC (rev 5940) +++ branches/unstable/src/win32.c 2011-09-21 15:35:38 UTC (rev 5941) @@ -735,33 +735,6 @@ } -/* Special dialog to ask for an action when closing an unsaved file */ -gint win32_message_dialog_unsaved(const gchar *msg) -{ - static wchar_t w_msg[512]; - static wchar_t w_title[512]; - HWND parent_hwnd = NULL; - gint ret; - - /* convert the Unicode chars to wide chars */ - MultiByteToWideChar(CP_UTF8, 0, msg, -1, w_msg, G_N_ELEMENTS(w_msg)); - MultiByteToWideChar(CP_UTF8, 0, _("Question"), -1, w_title, G_N_ELEMENTS(w_title)); - - if (main_widgets.window != NULL) - parent_hwnd = GDK_WINDOW_HWND(main_widgets.window->window); - - ret = MessageBoxW(parent_hwnd, w_msg, w_title, MB_YESNOCANCEL | MB_ICONQUESTION); - switch (ret) - { - case IDYES: ret = GTK_RESPONSE_YES; break; - case IDNO: ret = GTK_RESPONSE_NO; break; - case IDCANCEL: ret = GTK_RESPONSE_CANCEL; break; - } - - return ret; -} - - /* Just a simple wrapper function to open a browser window */ void win32_open_browser(const gchar *uri) { Modified: branches/unstable/src/win32.h =================================================================== --- branches/unstable/src/win32.h 2011-09-21 13:47:37 UTC (rev 5940) +++ branches/unstable/src/win32.h 2011-09-21 15:35:38 UTC (rev 5941) @@ -40,8 +40,6 @@ gboolean win32_message_dialog(GtkWidget *parent, GtkMessageType type, const gchar *msg); -gint win32_message_dialog_unsaved(const gchar *msg); - void win32_open_browser(const gchar *uri); gchar *win32_show_project_open_dialog(GtkWidget *parent, const gchar *title, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5940] branches/unstable
by ntrel＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 5940 http://geany.svn.sourceforge.net/geany/?rev=5940&view=rev Author: ntrel Date: 2011-09-21 13:47:37 +0000 (Wed, 21 Sep 2011) Log Message: ----------- Use #ifdef SYNC_SPAWN instead of G_OS_WIN32 for easier testing with glib's asynchronous spawning (currently doesn't work on Windows). Modified Paths: -------------- branches/unstable/ChangeLog branches/unstable/src/build.c Modified: branches/unstable/ChangeLog =================================================================== --- branches/unstable/ChangeLog 2011-09-21 13:43:23 UTC (rev 5939) +++ branches/unstable/ChangeLog 2011-09-21 13:47:37 UTC (rev 5940) @@ -1,3 +1,10 @@ +2011-09-21 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/build.c: + Use #ifdef SYNC_SPAWN instead of G_OS_WIN32 for easier testing with + glib's asynchronous spawning (currently doesn't work on Windows). + + 2011-09-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> * src/keyfile.c: Modified: branches/unstable/src/build.c =================================================================== --- branches/unstable/src/build.c 2011-09-21 13:43:23 UTC (rev 5939) +++ branches/unstable/src/build.c 2011-09-21 13:47:37 UTC (rev 5940) @@ -64,6 +64,11 @@ #include "toolbar.h" #include "geanymenubuttonaction.h" +/* g_spawn_async_with_pipes doesn't work on Windows */ +#ifdef G_OS_WIN32 +#define SYNC_SPAWN +#endif + /* Number of editor indicators to draw - limited as this can affect performance */ #define GEANY_BUILD_ERR_HIGHLIGHT_MAX 50 @@ -116,7 +121,7 @@ static gint build_groups_count[GEANY_GBG_COUNT] = { 3, 4, 2 }; static gint build_items_count = 9; -#ifndef G_OS_WIN32 +#ifndef SYNC_SPAWN static void build_exit_cb(GPid child_pid, gint status, gpointer user_data); static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data); #endif @@ -573,7 +578,7 @@ } -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN static void parse_build_output(const gchar **output, gint status) { guint x, i, len; @@ -592,7 +597,7 @@ { line = lines[i]; while (*line != '\0') - { /* replace any conrol characters in the output */ + { /* replace any control characters in the output */ if (*line < 32) *line = 32; line++; @@ -681,7 +686,7 @@ gchar *utf8_working_dir; gchar *cmd_string; gchar *utf8_cmd_string; -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN gchar *output[2]; gint status; #else @@ -728,7 +733,7 @@ build_info.file_type_id = (doc == NULL) ? GEANY_FILETYPES_NONE : doc->file_type->id; build_info.message_count = 0; -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN if (! utils_spawn_sync(working_dir, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &output[0], &output[1], &status, &error)) #else @@ -746,7 +751,7 @@ return (GPid) 0; } -#ifdef G_OS_WIN32 +#ifdef SYNC_SPAWN parse_build_output((const gchar**) output, status); g_free(output[0]); g_free(output[1]); @@ -1028,7 +1033,7 @@ } -#ifndef G_OS_WIN32 +#ifndef SYNC_SPAWN static gboolean build_iofunc(GIOChannel *ioc, GIOCondition cond, gpointer data) { if (cond & (G_IO_IN | G_IO_PRI)) @@ -1123,11 +1128,14 @@ } -#ifndef G_OS_WIN32 +#ifndef SYNC_SPAWN static void build_exit_cb(GPid child_pid, gint status, gpointer user_data) { gboolean failure = FALSE; +#ifdef G_OS_WIN32 + failure = status; +#else if (WIFEXITED(status)) { if (WEXITSTATUS(status) != EXIT_SUCCESS) @@ -1142,6 +1150,7 @@ { /* any other failure occured */ failure = TRUE; } +#endif show_build_result_message(failure); utils_beep(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5939] branches/unstable/
by ntrel＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 5939 http://geany.svn.sourceforge.net/geany/?rev=5939&view=rev Author: ntrel Date: 2011-09-21 13:43:23 +0000 (Wed, 21 Sep 2011) Log Message: ----------- Create unstable branch until 0.21 is released from trunk r5938. Revision Links: -------------- http://geany.svn.sourceforge.net/geany/?rev=5938&view=rev Added Paths: ----------- branches/unstable/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5938] trunk/doc
by ntrel＠users.sourceforge.net 21 Sep '11

21 Sep '11

Revision: 5938 http://geany.svn.sourceforge.net/geany/?rev=5938&view=rev Author: ntrel Date: 2011-09-21 13:31:00 +0000 (Wed, 21 Sep 2011) Log Message: ----------- Update for use_atomic_file_saving change. Modified Paths: -------------- trunk/doc/geany.html trunk/doc/geany.txt Modified: trunk/doc/geany.html =================================================================== --- trunk/doc/geany.html 2011-09-20 14:29:46 UTC (rev 5937) +++ trunk/doc/geany.html 2011-09-21 13:31:00 UTC (rev 5938) @@ -2906,7 +2906,7 @@ <td> </td> <td> </td> </tr> -<tr><td>use_safe_file_saving</td> +<tr><td>use_atomic_file_saving</td> <td>Defines the mode how Geany saves files to disk. If disabled, Geany directly writes the content of the document to disk. This Modified: trunk/doc/geany.txt =================================================================== --- trunk/doc/geany.txt 2011-09-20 14:29:46 UTC (rev 5937) +++ trunk/doc/geany.txt 2011-09-21 13:31:00 UTC (rev 5938) @@ -2498,10 +2498,10 @@ it to be executed directly, set this option to true. **File related** -use_safe_file_saving Defines the mode how Geany saves files to false immediately +use_atomic_file_saving Defines the mode how Geany saves files to false immediately disk. If disabled, Geany directly writes the content of the document to disk. This - might cause in loss of data when there is + might cause loss of data when there is no more free space on disk to save the file. When set to true, Geany first saves the contents into a temporary file and if This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany:[5937] trunk
by ntrel＠users.sourceforge.net 20 Sep '11

20 Sep '11

Revision: 5937 http://geany.svn.sourceforge.net/geany/?rev=5937&view=rev Author: ntrel Date: 2011-09-20 14:29:46 +0000 (Tue, 20 Sep 2011) Log Message: ----------- Rename use_safe_file_saving various pref to use_atomic_file_saving as it's not 'safe'. Use old pref if new one is missing for compatibility with Geany <= 0.20. Modified Paths: -------------- trunk/ChangeLog trunk/src/keyfile.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2011-09-19 18:54:29 UTC (rev 5936) +++ trunk/ChangeLog 2011-09-20 14:29:46 UTC (rev 5937) @@ -1,3 +1,11 @@ +2011-09-20 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com> + + * src/keyfile.c: + Rename use_safe_file_saving various pref to use_atomic_file_saving + as it's not 'safe'. Use old pref if new one is missing for + compatibility with Geany <= 0.20. + + 2011-09-17 Frank Lanitz <frlan(a)frank.uvena.de> * po/fa.po, THANKS, src/about.c: Modified: trunk/src/keyfile.c =================================================================== --- trunk/src/keyfile.c 2011-09-19 18:54:29 UTC (rev 5936) +++ trunk/src/keyfile.c 2011-09-20 14:29:46 UTC (rev 5937) @@ -92,8 +92,10 @@ static gint session_notebook_page; static gint hpan_position; static gint vpan_position; +static const gchar atomic_file_saving_key[] = "use_atomic_file_saving"; static GPtrArray *keyfile_groups = NULL; + GPtrArray *pref_groups = NULL; @@ -193,7 +195,7 @@ stash_group_add_boolean(group, &editor_prefs.complete_snippets_whilst_editing, "complete_snippets_whilst_editing", FALSE); stash_group_add_boolean(group, &file_prefs.use_safe_file_saving, - "use_safe_file_saving", FALSE); + atomic_file_saving_key, FALSE); stash_group_add_boolean(group, &file_prefs.gio_unsafe_save_backup, "gio_unsafe_save_backup", FALSE); stash_group_add_boolean(group, &file_prefs.use_gio_unsafe_file_saving, @@ -664,12 +666,20 @@ } +/* note: new settings should be added in init_pref_groups() */ static void load_dialog_prefs(GKeyFile *config) { gchar *tmp_string, *tmp_string2; const gchar *default_charset = NULL; - /* new settings should be added in init_pref_groups() */ + /* compatibility with Geany 0.20 */ + if (!g_key_file_has_key(config, PACKAGE, atomic_file_saving_key, NULL)) + { + g_key_file_set_boolean(config, PACKAGE, atomic_file_saving_key, + utils_get_setting_boolean(config, PACKAGE, "use_safe_file_saving", FALSE)); + } + + /* read stash prefs */ settings_action(config, SETTING_READ); /* general */ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2011