Commits July 2007

commits@lists.geany.org

3 participants
112 discussions

SF.net SVN: geany: [1717] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1717 http://geany.svn.sourceforge.net/geany/?rev=1717&view=rev Author: eht16 Date: 2007-07-17 08:48:53 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Fix broken configure when using autoconf < 2.60. Modified Paths: -------------- trunk/ChangeLog trunk/configure.in Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-17 14:52:57 UTC (rev 1716) +++ trunk/ChangeLog 2007-07-17 15:48:53 UTC (rev 1717) @@ -35,6 +35,7 @@ Windows. Use GetFullPathName() instead of lrealpath() to get Tagmanager working on files containing special characters on Windows. + * configure.in: Fix broken configure when using autoconf < 2.60. 2007-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2007-07-17 14:52:57 UTC (rev 1716) +++ trunk/configure.in 2007-07-17 15:48:53 UTC (rev 1717) @@ -5,9 +5,11 @@ AM_INIT_AUTOMAKE(geany, 0.12) AM_CONFIG_HEADER(config.h) -# AC_USE_SYSTEM_EXTENSIONS combines AC_MINIX, AC_AIX and AC_GNU_SOURCE -AC_USE_SYSTEM_EXTENSIONS +AC_GNU_SOURCE +AC_AIX +AC_MINIX + AC_PROG_CC AM_CONDITIONAL(IS_COMPILER_GCC,test x$SSC == x) This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1716] trunk
by ntrel＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1716 http://geany.svn.sourceforge.net/geany/?rev=1716&view=rev Author: ntrel Date: 2007-07-17 07:52:57 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Move font & file open/save dialog callbacks to dialogs.c. Add document_clone() in document.c (for Save As open in new tab). Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/callbacks.h trunk/src/dialogs.c trunk/src/document.c trunk/src/document.h Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-17 12:37:48 UTC (rev 1715) +++ trunk/ChangeLog 2007-07-17 14:52:57 UTC (rev 1716) @@ -1,3 +1,11 @@ +2007-07-17 Nick Treleaven <nick.treleaven(a)btinternet.com> + + * src/dialogs.c, src/callbacks.c, src/callbacks.h, src/document.c, + src/document.h: + Move font & file open/save dialog callbacks to dialogs.c. + Add document_clone() in document.c (for Save As open in new tab). + + 2007-07-17 Enrico Tröger <enrico.troeger(a)uvena.de> * src/editor.c: Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-07-17 12:37:48 UTC (rev 1715) +++ trunk/src/callbacks.c 2007-07-17 14:52:57 UTC (rev 1716) @@ -781,238 +781,6 @@ /* - * open dialog callbacks -*/ - -// file open dialog, opened -void -on_file_open_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data) -{ - gtk_widget_hide(app->open_filesel); - - if (response == GTK_RESPONSE_ACCEPT || response == GTK_RESPONSE_APPLY) - { - GSList *filelist; - gint filetype_idx = gtk_combo_box_get_active(GTK_COMBO_BOX( - lookup_widget(GTK_WIDGET(dialog), "filetype_combo"))); - gint encoding_idx = gtk_combo_box_get_active(GTK_COMBO_BOX( - lookup_widget(GTK_WIDGET(dialog), "encoding_combo"))); - filetype *ft = NULL; - gchar *charset = NULL; - gboolean ro = (response == GTK_RESPONSE_APPLY); // View clicked - - if (filetype_idx >= 0 && filetype_idx < GEANY_FILETYPES_ALL) ft = filetypes[filetype_idx]; - if (encoding_idx >= 0 && encoding_idx < GEANY_ENCODINGS_MAX) - charset = encodings[encoding_idx].charset; - - filelist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(app->open_filesel)); - if (filelist != NULL) - { - document_open_files(filelist, ro, ft, charset); - g_slist_foreach(filelist, (GFunc) g_free, NULL); // free filenames - } - g_slist_free(filelist); - } -} - - -// callback for the text entry for typing in filename -void -on_file_open_entry_activate (GtkEntry *entry, - gpointer user_data) -{ - gchar *locale_filename = utils_get_locale_from_utf8(gtk_entry_get_text(entry)); - - if (g_file_test(locale_filename, G_FILE_TEST_IS_DIR)) - { - gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(app->open_filesel), locale_filename); - } - else if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) - { - gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(app->open_filesel), locale_filename); - on_file_open_dialog_response(GTK_DIALOG(app->open_filesel), GTK_RESPONSE_ACCEPT, NULL); - } - - g_free(locale_filename); -} - - -void -on_file_open_selection_changed (GtkFileChooser *filechooser, - gpointer user_data) -{ - gchar *filename = gtk_file_chooser_get_filename(filechooser); - gboolean is_on = gtk_file_chooser_get_show_hidden(filechooser); - - if (filename) - { - // try to get the UTF-8 equivalent for the filename, fallback to filename if error - gchar *utf8_filename = utils_get_utf8_from_locale(filename); - - gtk_entry_set_text(GTK_ENTRY(lookup_widget( - GTK_WIDGET(filechooser), "file_entry")), utf8_filename); - g_free(utf8_filename); - g_free(filename); - } - - gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( - lookup_widget(GTK_WIDGET(filechooser), "check_hidden")), is_on); -} - - -static gint -clone_document(gint old_idx, const gchar *utf8_filename) -{ - // create a new file and copy file content and properties - gint len, idx; - gchar *data; - - // use old file type (or maybe NULL for auto detect would be better?) - idx = document_new_file(utf8_filename, doc_list[old_idx].file_type); - - sci_set_undo_collection(doc_list[idx].sci, FALSE); // avoid creation of an undo action - sci_empty_undo_buffer(doc_list[idx].sci); - - len = sci_get_length(doc_list[old_idx].sci) + 1; - data = (gchar*) g_malloc(len); - sci_get_text(doc_list[old_idx].sci, len, data); - - sci_set_text(doc_list[idx].sci, data); - - // copy file properties - doc_list[idx].line_breaking = doc_list[old_idx].line_breaking; - doc_list[idx].readonly = doc_list[old_idx].readonly; - doc_list[idx].has_bom = doc_list[old_idx].has_bom; - document_set_encoding(idx, doc_list[old_idx].encoding); - sci_set_lines_wrapped(doc_list[idx].sci, doc_list[idx].line_breaking); - sci_set_readonly(doc_list[idx].sci, doc_list[idx].readonly); - sci_set_undo_collection(doc_list[idx].sci, TRUE); - - ui_document_show_hide(idx); - - g_free(data); - return idx; -} - - -/* - * save dialog callbacks - */ -void -on_file_save_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data) -{ - gboolean rename_file = FALSE; - - switch (response) - { - case GTK_RESPONSE_APPLY: - rename_file = TRUE; - // fall through - - case GTK_RESPONSE_ACCEPT: - { - gint idx = document_get_cur_idx(); - gchar *new_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(app->save_filesel)); - gchar *utf8_filename; - gboolean open_new_tab = gtk_toggle_button_get_active( - GTK_TOGGLE_BUTTON(lookup_widget(app->save_filesel, "check_open_new_tab"))); - -#ifdef G_OS_WIN32 - utf8_filename = g_strdup(new_filename); -#else - utf8_filename = utils_get_utf8_from_locale(new_filename); -#endif - // check if file exists and ask whether to overwrite or not - if (g_file_test(new_filename, G_FILE_TEST_EXISTS)) - { - if (dialogs_show_question( - _("The file '%s' already exists. Do you want to overwrite it?"), - utf8_filename) == FALSE) - return; - } - - if (open_new_tab) - { // "open" the saved file in a new tab - idx = clone_document(idx, utf8_filename); - g_free(utf8_filename); - } - else - { - if (doc_list[idx].file_name != NULL) - { - if (rename_file) - { // delete the previous file name -#ifdef G_OS_WIN32 - g_unlink(doc_list[idx].file_name); -#else - gchar *old_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); - - g_unlink(old_filename); - g_free(old_filename); -#endif - } - // create a new tm_source_file object otherwise tagmanager won't work correctly - tm_workspace_remove_object(doc_list[idx].tm_file, TRUE); - doc_list[idx].tm_file = NULL; - g_free(doc_list[idx].file_name); - } - doc_list[idx].file_name = utf8_filename; - } - utils_replace_filename(idx); - document_save_file(idx, TRUE); - - if (! open_new_tab) - build_menu_update(idx); - - // finally add current file to recent files menu - ui_add_recent_file(doc_list[idx].file_name); - - g_free(new_filename); - } - } - gtk_widget_hide(app->save_filesel); -} - - -/* - * font dialog callbacks - */ -void -on_font_ok_button_clicked (GtkButton *button, - gpointer user_data) -{ - // We do the same thing as apply, but we close the dialog after. - on_font_apply_button_clicked(button, NULL); - gtk_widget_hide(app->open_fontsel); -} - - -void -on_font_apply_button_clicked (GtkButton *button, - gpointer user_data) -{ - gchar *fontname; - - fontname = gtk_font_selection_dialog_get_font_name( - GTK_FONT_SELECTION_DIALOG(app->open_fontsel)); - ui_set_editor_font(fontname); - g_free(fontname); -} - - -void -on_font_cancel_button_clicked (GtkButton *button, - gpointer user_data) -{ - gtk_widget_hide(app->open_fontsel); -} - - -/* * color dialog callbacks */ void @@ -1763,16 +1531,6 @@ void -on_file_open_check_hidden_toggled (GtkToggleButton *togglebutton, - gpointer user_data) -{ - gboolean is_on = gtk_toggle_button_get_active(togglebutton); - - gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(app->open_filesel), is_on); -} - - -void on_file_properties_activate (GtkMenuItem *menuitem, gpointer user_data) { Modified: trunk/src/callbacks.h =================================================================== --- trunk/src/callbacks.h 2007-07-17 12:37:48 UTC (rev 1715) +++ trunk/src/callbacks.h 2007-07-17 14:52:57 UTC (rev 1716) @@ -89,22 +89,12 @@ gpointer user_data); void -on_file_open_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data); - -void on_notebook1_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data); void -on_file_save_dialog_response (GtkDialog *dialog, - gint response, - gpointer user_data); - -void on_color_ok_button_clicked (GtkButton *button, gpointer user_data); @@ -113,10 +103,6 @@ gpointer user_data); void -on_font_cancel_button_clicked (GtkButton *button, - gpointer user_data); - -void on_save_all1_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -124,14 +110,6 @@ on_close1_activate (GtkMenuItem *menuitem, gpointer user_data); -void -on_font_ok_button_clicked (GtkButton *button, - gpointer user_data); - -void -on_font_apply_button_clicked (GtkButton *button, - gpointer user_data); - gboolean on_close_all1_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -391,14 +369,6 @@ gpointer user_data); void -on_file_open_selection_changed (GtkFileChooser *filechooser, - gpointer user_data); - -void -on_file_open_entry_activate (GtkEntry *entry, - gpointer user_data); - -void on_toolbar_large_icons1_activate (GtkMenuItem *menuitem, gpointer user_data); @@ -411,10 +381,6 @@ gpointer user_data); void -on_file_open_check_hidden_toggled (GtkToggleButton *togglebutton, - gpointer user_data); - -void on_tv_notebook_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, Modified: trunk/src/dialogs.c =================================================================== --- trunk/src/dialogs.c 2007-07-17 12:37:48 UTC (rev 1715) +++ trunk/src/dialogs.c 2007-07-17 14:52:57 UTC (rev 1716) @@ -52,14 +52,109 @@ #include "ui_utils.h" #include "keybindings.h" #include "encodings.h" +#include "build.h" #if ! GEANY_USE_WIN32_DIALOG static GtkWidget *add_file_open_extra_widget(); -static void on_save_as_new_tab_toggled(GtkToggleButton *togglebutton, gpointer user_data); #endif +#if ! GEANY_USE_WIN32_DIALOG +static void +on_file_open_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data) +{ + gtk_widget_hide(app->open_filesel); + + if (response == GTK_RESPONSE_ACCEPT || response == GTK_RESPONSE_APPLY) + { + GSList *filelist; + gint filetype_idx = gtk_combo_box_get_active(GTK_COMBO_BOX( + lookup_widget(GTK_WIDGET(dialog), "filetype_combo"))); + gint encoding_idx = gtk_combo_box_get_active(GTK_COMBO_BOX( + lookup_widget(GTK_WIDGET(dialog), "encoding_combo"))); + filetype *ft = NULL; + gchar *charset = NULL; + gboolean ro = (response == GTK_RESPONSE_APPLY); // View clicked + + if (filetype_idx >= 0 && filetype_idx < GEANY_FILETYPES_ALL) ft = filetypes[filetype_idx]; + if (encoding_idx >= 0 && encoding_idx < GEANY_ENCODINGS_MAX) + charset = encodings[encoding_idx].charset; + + filelist = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(app->open_filesel)); + if (filelist != NULL) + { + document_open_files(filelist, ro, ft, charset); + g_slist_foreach(filelist, (GFunc) g_free, NULL); // free filenames + } + g_slist_free(filelist); + } +} +#endif + + +#if ! GEANY_USE_WIN32_DIALOG +// callback for the text entry for typing in filename +static void +on_file_open_entry_activate (GtkEntry *entry, + gpointer user_data) +{ + gchar *locale_filename = utils_get_locale_from_utf8(gtk_entry_get_text(entry)); + + if (g_file_test(locale_filename, G_FILE_TEST_IS_DIR)) + { + gtk_file_chooser_set_current_folder(GTK_FILE_CHOOSER(app->open_filesel), locale_filename); + } + else if (g_file_test(locale_filename, G_FILE_TEST_IS_REGULAR | G_FILE_TEST_IS_SYMLINK)) + { + gtk_file_chooser_set_filename(GTK_FILE_CHOOSER(app->open_filesel), locale_filename); + on_file_open_dialog_response(GTK_DIALOG(app->open_filesel), GTK_RESPONSE_ACCEPT, NULL); + } + + g_free(locale_filename); +} +#endif + + +#if ! GEANY_USE_WIN32_DIALOG +static void +on_file_open_selection_changed (GtkFileChooser *filechooser, + gpointer user_data) +{ + gchar *filename = gtk_file_chooser_get_filename(filechooser); + gboolean is_on = gtk_file_chooser_get_show_hidden(filechooser); + + if (filename) + { + // try to get the UTF-8 equivalent for the filename, fallback to filename if error + gchar *utf8_filename = utils_get_utf8_from_locale(filename); + + gtk_entry_set_text(GTK_ENTRY(lookup_widget( + GTK_WIDGET(filechooser), "file_entry")), utf8_filename); + g_free(utf8_filename); + g_free(filename); + } + + gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON( + lookup_widget(GTK_WIDGET(filechooser), "check_hidden")), is_on); +} +#endif + + +#if ! GEANY_USE_WIN32_DIALOG +static void +on_file_open_check_hidden_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + gboolean is_on = gtk_toggle_button_get_active(togglebutton); + + gtk_file_chooser_set_show_hidden(GTK_FILE_CHOOSER(app->open_filesel), is_on); +} +#endif + + /* This shows the file selection dialog to open a file. */ void dialogs_show_open_file () { @@ -172,7 +267,7 @@ } -#ifndef USE_WIN32_DIALOG +#if ! GEANY_USE_WIN32_DIALOG static GtkWidget *add_file_open_extra_widget() { GtkWidget *vbox, *table, *file_entry, *check_hidden; @@ -265,6 +360,95 @@ #endif +#if ! GEANY_USE_WIN32_DIALOG +static void on_save_as_new_tab_toggled(GtkToggleButton *togglebutton, gpointer user_data) +{ + gtk_widget_set_sensitive(GTK_WIDGET(user_data), + ! gtk_toggle_button_get_active(togglebutton)); +} +#endif + + +#if ! GEANY_USE_WIN32_DIALOG +static void +on_file_save_dialog_response (GtkDialog *dialog, + gint response, + gpointer user_data) +{ + gboolean rename_file = FALSE; + + switch (response) + { + case GTK_RESPONSE_APPLY: + rename_file = TRUE; + // fall through + + case GTK_RESPONSE_ACCEPT: + { + gint idx = document_get_cur_idx(); + gchar *new_filename = gtk_file_chooser_get_filename(GTK_FILE_CHOOSER(app->save_filesel)); + gchar *utf8_filename; + gboolean open_new_tab = gtk_toggle_button_get_active( + GTK_TOGGLE_BUTTON(lookup_widget(app->save_filesel, "check_open_new_tab"))); + +#ifdef G_OS_WIN32 + utf8_filename = g_strdup(new_filename); +#else + utf8_filename = utils_get_utf8_from_locale(new_filename); +#endif + // check if file exists and ask whether to overwrite or not + if (g_file_test(new_filename, G_FILE_TEST_EXISTS)) + { + if (dialogs_show_question( + _("The file '%s' already exists. Do you want to overwrite it?"), + utf8_filename) == FALSE) + return; + } + + if (open_new_tab) + { // "open" the saved file in a new tab + idx = document_clone(idx, utf8_filename); + g_free(utf8_filename); + } + else + { + if (doc_list[idx].file_name != NULL) + { + if (rename_file) + { // delete the previous file name +#ifdef G_OS_WIN32 + g_unlink(doc_list[idx].file_name); +#else + gchar *old_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); + + g_unlink(old_filename); + g_free(old_filename); +#endif + } + // create a new tm_source_file object otherwise tagmanager won't work correctly + tm_workspace_remove_object(doc_list[idx].tm_file, TRUE); + doc_list[idx].tm_file = NULL; + g_free(doc_list[idx].file_name); + } + doc_list[idx].file_name = utf8_filename; + } + utils_replace_filename(idx); + document_save_file(idx, TRUE); + + if (! open_new_tab) + build_menu_update(idx); + + // finally add current file to recent files menu + ui_add_recent_file(doc_list[idx].file_name); + + g_free(new_filename); + } + } + gtk_widget_hide(app->save_filesel); +} +#endif + + /* This shows the file selection dialog to save a file, returning TRUE if * the file was saved. */ gboolean dialogs_show_save_as() @@ -468,6 +652,37 @@ } +static void +on_font_apply_button_clicked (GtkButton *button, + gpointer user_data) +{ + gchar *fontname; + + fontname = gtk_font_selection_dialog_get_font_name( + GTK_FONT_SELECTION_DIALOG(app->open_fontsel)); + ui_set_editor_font(fontname); + g_free(fontname); +} + + +static void +on_font_ok_button_clicked (GtkButton *button, + gpointer user_data) +{ + // We do the same thing as apply, but we close the dialog after. + on_font_apply_button_clicked(button, NULL); + gtk_widget_hide(app->open_fontsel); +} + + +static void +on_font_cancel_button_clicked (GtkButton *button, + gpointer user_data) +{ + gtk_widget_hide(app->open_fontsel); +} + + /* This shows the font selection dialog to choose a font. */ void dialogs_show_open_font() { @@ -1149,8 +1364,3 @@ } -static void on_save_as_new_tab_toggled(GtkToggleButton *togglebutton, gpointer user_data) -{ - gtk_widget_set_sensitive(GTK_WIDGET(user_data), - ! gtk_toggle_button_get_active(togglebutton)); -} Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-07-17 12:37:48 UTC (rev 1715) +++ trunk/src/document.c 2007-07-17 14:52:57 UTC (rev 1716) @@ -2308,3 +2308,39 @@ else sci_add_text(doc_list[idx].sci, colour); } + + +gint document_clone(gint old_idx, const gchar *utf8_filename) +{ + // create a new file and copy file content and properties + gint len, idx; + gchar *data; + + // use old file type (or maybe NULL for auto detect would be better?) + idx = document_new_file(utf8_filename, doc_list[old_idx].file_type); + + sci_set_undo_collection(doc_list[idx].sci, FALSE); // avoid creation of an undo action + sci_empty_undo_buffer(doc_list[idx].sci); + + len = sci_get_length(doc_list[old_idx].sci) + 1; + data = (gchar*) g_malloc(len); + sci_get_text(doc_list[old_idx].sci, len, data); + + sci_set_text(doc_list[idx].sci, data); + + // copy file properties + doc_list[idx].line_breaking = doc_list[old_idx].line_breaking; + doc_list[idx].readonly = doc_list[old_idx].readonly; + doc_list[idx].has_bom = doc_list[old_idx].has_bom; + document_set_encoding(idx, doc_list[old_idx].encoding); + sci_set_lines_wrapped(doc_list[idx].sci, doc_list[idx].line_breaking); + sci_set_readonly(doc_list[idx].sci, doc_list[idx].readonly); + sci_set_undo_collection(doc_list[idx].sci, TRUE); + + ui_document_show_hide(idx); + + g_free(data); + return idx; +} + + Modified: trunk/src/document.h =================================================================== --- trunk/src/document.h 2007-07-17 12:37:48 UTC (rev 1715) +++ trunk/src/document.h 2007-07-17 14:52:57 UTC (rev 1716) @@ -133,7 +133,9 @@ filename is expected in UTF-8 encoding. */ gint document_new_file(const gchar *filename, filetype *ft); +gint document_clone(gint old_idx, const gchar *utf8_filename); + /* To open a new file, set idx to -1; filename should be locale encoded. * To reload a file, set the idx for the document to be reloaded; filename should be NULL. * Returns: idx of the opened file or -1 if an error occurred. @@ -160,6 +162,7 @@ * It returns whether the file could be saved or not. */ gboolean document_save_file(gint idx, gboolean force); + gboolean document_search_bar_find(gint idx, const gchar *text, gint flags, gboolean inc); /* General search function, used from the find dialog. This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1715] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1715 http://svn.sourceforge.net/geany/?rev=1715&view=rev Author: eht16 Date: 2007-07-17 05:37:48 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Fix compiler warnings. Modified Paths: -------------- trunk/src/document.c trunk/tagmanager/ctags.c trunk/tagmanager/entry.c trunk/tagmanager/read.c trunk/tagmanager/regex.c trunk/tagmanager/sort.c trunk/tagmanager/strlist.c trunk/tagmanager/tm_file_entry.c trunk/tagmanager/tm_project.c trunk/tagmanager/tm_work_object.c trunk/tagmanager/tm_workspace.c Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/src/document.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -1085,7 +1085,7 @@ // ignore the following things if we are quitting if (! app->quitting) { - gchar *basename = g_path_get_basename(doc_list[idx].file_name); + gchar *base_name = g_path_get_basename(doc_list[idx].file_name); // set line numbers again, to reset the margin width, if // there are more lines than before @@ -1103,11 +1103,11 @@ } document_set_filetype(idx, doc_list[idx].file_type); tm_workspace_update(TM_WORK_OBJECT(app->tm_workspace), TRUE, TRUE, FALSE); - gtk_label_set_text(GTK_LABEL(doc_list[idx].tab_label), basename); - gtk_label_set_text(GTK_LABEL(doc_list[idx].tabmenu_label), basename); + gtk_label_set_text(GTK_LABEL(doc_list[idx].tab_label), base_name); + gtk_label_set_text(GTK_LABEL(doc_list[idx].tabmenu_label), base_name); msgwin_status_add(_("File %s saved."), doc_list[idx].file_name); ui_update_statusbar(idx, -1); - g_free(basename); + g_free(base_name); #ifdef HAVE_VTE vte_cwd(doc_list[idx].file_name, FALSE); #endif Modified: trunk/tagmanager/ctags.c =================================================================== --- trunk/tagmanager/ctags.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/ctags.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -21,6 +21,7 @@ */ #include "general.h" /* must always come first */ #include <glib.h> +#include <glib/gstdio.h> #ifdef HAVE_STDLIB_H # include <stdlib.h> /* to declare malloc (), realloc () */ Modified: trunk/tagmanager/entry.c =================================================================== --- trunk/tagmanager/entry.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/entry.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -17,6 +17,7 @@ #include <ctype.h> /* to define isspace () */ #include <errno.h> #include <glib.h> +#include <glib/gstdio.h> #if defined (HAVE_SYS_TYPES_H) # include <sys/types.h> /* to declare off_t on some hosts */ Modified: trunk/tagmanager/read.c =================================================================== --- trunk/tagmanager/read.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/read.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -16,6 +16,7 @@ #include <string.h> #include <ctype.h> +#include <glib/gstdio.h> #define FILE_WRITE #include "read.h" Modified: trunk/tagmanager/regex.c =================================================================== --- trunk/tagmanager/regex.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/regex.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -27,6 +27,7 @@ # endif # include "regex.h" #endif +#include <glib/gstdio.h> #include "entry.h" #include "main.h" Modified: trunk/tagmanager/sort.c =================================================================== --- trunk/tagmanager/sort.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/sort.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -19,6 +19,7 @@ #include <string.h> #include <stdio.h> #include <glib.h> +#include <glib/gstdio.h> #include "entry.h" #include "main.h" Modified: trunk/tagmanager/strlist.c =================================================================== --- trunk/tagmanager/strlist.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/strlist.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -18,6 +18,7 @@ #ifdef HAVE_FNMATCH_H # include <fnmatch.h> #endif +#include <glib/gstdio.h> #include "main.h" #include "read.h" Modified: trunk/tagmanager/tm_file_entry.c =================================================================== --- trunk/tagmanager/tm_file_entry.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/tm_file_entry.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -22,6 +22,7 @@ #ifdef HAVE_FNMATCH_H # include <fnmatch.h> #endif +#include <glib/gstdio.h> #include "tm_work_object.h" #include "tm_file_entry.h" Modified: trunk/tagmanager/tm_project.c =================================================================== --- trunk/tagmanager/tm_project.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/tm_project.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -18,6 +18,7 @@ #ifdef HAVE_FNMATCH_H # include <fnmatch.h> #endif +#include <glib/gstdio.h> #include "options.h" Modified: trunk/tagmanager/tm_work_object.c =================================================================== --- trunk/tagmanager/tm_work_object.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/tm_work_object.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -14,6 +14,7 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#include <glib/gstdio.h> #ifdef G_OS_WIN32 # define VC_EXTRALEAN # define WIN32_LEAN_AND_MEAN Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2007-07-17 12:04:46 UTC (rev 1714) +++ trunk/tagmanager/tm_workspace.c 2007-07-17 12:37:48 UTC (rev 1715) @@ -19,6 +19,7 @@ #ifdef HAVE_GLOB_H # include <glob.h> #endif +#include <glib/gstdio.h> // handling of P_tmpdir, should be something like /tmp, take the root directory under Win32, // and assume /tmp on non-Win32 systems where P_tmpdir is not set #ifndef P_tmpdir This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1714] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1714 http://svn.sourceforge.net/geany/?rev=1714&view=rev Author: eht16 Date: 2007-07-17 05:04:46 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Always use g_fopen() and g_stat() instead of fopen() and stat() to fix several problems with filenames containing special characters on Windows. Use GetFullPathName() instead of lrealpath() to get Tagmanager working on files containing special characters on Windows. Modified Paths: -------------- trunk/ChangeLog trunk/src/build.c trunk/src/document.c trunk/src/utils.c trunk/src/win32.c trunk/tagmanager/ctags.c trunk/tagmanager/entry.c trunk/tagmanager/parse.c trunk/tagmanager/read.c trunk/tagmanager/regex.c trunk/tagmanager/sort.c trunk/tagmanager/strlist.c trunk/tagmanager/tm_file_entry.c trunk/tagmanager/tm_project.c trunk/tagmanager/tm_work_object.c trunk/tagmanager/tm_workspace.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/ChangeLog 2007-07-17 12:04:46 UTC (rev 1714) @@ -17,6 +17,16 @@ when running make. * src/win32.c: Fix creation of wrong hex colours when inserting colours from the colour chooser dialog. + * tagmanager/ctags.c, tagmanager/entry.c, tagmanager/tm_source_file.c, + tagmanager/strlist.c, tagmanager/tm_project.c, tagmanager/sort.c, + tagmanager/tm_work_object.c, tagmanager/read.c, tagmanager/regex.c, + tagmanager/tm_workspace.c, tagmanager/parse.c, + tagmanager/tm_file_entry.c, src/build.c, src/document.c, src/utils.c: + Always use g_fopen() and g_stat() instead of fopen() and stat() to + fix several problems with filenames containing special characters on + Windows. + Use GetFullPathName() instead of lrealpath() to get Tagmanager + working on files containing special characters on Windows. 2007-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/build.c =================================================================== --- trunk/src/build.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/src/build.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -941,7 +941,7 @@ gchar *tmp; #endif - fp = fopen(fname, "w"); + fp = g_fopen(fname, "w"); if (! fp) return FALSE; #ifdef G_OS_WIN32 Modified: trunk/src/document.c =================================================================== --- trunk/src/document.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/src/document.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -1054,10 +1054,10 @@ len = strlen(data); } #ifdef G_OS_WIN32 - fp = fopen(doc_list[idx].file_name, "wb"); // this should fix the windows \n problem + fp = g_fopen(doc_list[idx].file_name, "wb"); // this should fix the windows \n problem #else locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); - fp = fopen(locale_filename, "w"); + fp = g_fopen(locale_filename, "w"); g_free(locale_filename); #endif if (fp == NULL) @@ -1538,10 +1538,15 @@ if (doc_list[idx].tm_file == NULL) { +#ifdef GEANY_OS_WIN32 + doc_list[idx].tm_file = tm_source_file_new( + doc_list[idx].file_name, FALSE, doc_list[idx].file_type->name); +#else gchar *locale_filename = utils_get_locale_from_utf8(doc_list[idx].file_name); - doc_list[idx].tm_file = tm_source_file_new(locale_filename, FALSE, - doc_list[idx].file_type->name); + doc_list[idx].tm_file = tm_source_file_new( + locale_filename, FALSE, doc_list[idx].file_type->name); g_free(locale_filename); +#endif if (! doc_list[idx].tm_file) return; tm_workspace_add_object(doc_list[idx].tm_file); if (update) Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/src/utils.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -249,7 +249,7 @@ len = strlen(text); - fp = fopen(filename, "w"); + fp = g_fopen(filename, "w"); if (fp != NULL) { bytes_written = fwrite(text, sizeof (gchar), len, fp); Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/src/win32.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -29,6 +29,8 @@ #ifdef G_OS_WIN32 +#define VC_EXTRALEAN +#define WIN32_LEAN_AND_MEAN #include <windows.h> #include <commdlg.h> #include <shlobj.h> Modified: trunk/tagmanager/ctags.c =================================================================== --- trunk/tagmanager/ctags.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/ctags.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -427,7 +427,7 @@ struct stat fileStatus; unsigned long size = 0; - if (stat (name, &fileStatus) == 0) + if (g_stat (name, &fileStatus) == 0) size = fileStatus.st_size; return size; @@ -442,7 +442,7 @@ struct stat fileStatus; boolean result = FALSE; - if (lstat (name, &fileStatus) == 0) + if (g_lstat (name, &fileStatus) == 0) result = (boolean) (S_ISLNK (fileStatus.st_mode)); return result; @@ -454,7 +454,7 @@ struct stat fileStatus; boolean result = FALSE; - if (stat (name, &fileStatus) == 0) + if (g_stat (name, &fileStatus) == 0) result = (boolean) (S_ISREG (fileStatus.st_mode)); return result; @@ -466,7 +466,7 @@ struct stat fileStatus; boolean result = FALSE; - if (stat (name, &fileStatus) == 0) + if (g_stat (name, &fileStatus) == 0) result = (boolean) ((fileStatus.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) != 0); return result; @@ -478,7 +478,7 @@ #ifdef HAVE_STAT_ST_INO struct stat stat1, stat2; - if (stat (name1, &stat1) == 0 && stat (name2, &stat2) == 0) + if (g_stat (name1, &stat1) == 0 && g_stat (name2, &stat2) == 0) result = (boolean) (stat1.st_ino == stat2.st_ino); #endif return result; @@ -494,7 +494,7 @@ struct stat fileStatus; boolean result = FALSE; - if (stat (name, &fileStatus) == 0) + if (g_stat (name, &fileStatus) == 0) result = (boolean) ((fileStatus.st_mode & S_ISUID) != 0); return result; @@ -525,7 +525,7 @@ #else struct stat fileStatus; - if (stat (name, &fileStatus) == 0) + if (g_stat (name, &fileStatus) == 0) result = (boolean) S_ISDIR (fileStatus.st_mode); #endif return result; @@ -536,7 +536,7 @@ { struct stat fileStatus; - return (boolean) (stat (fileName, &fileStatus) == 0); + return (boolean) (g_stat (fileName, &fileStatus) == 0); } //#ifndef HAVE_FGETPOS @@ -1194,7 +1194,7 @@ resize = createTagsFromFileInput (stdin, FALSE); else { - FILE* const fp = fopen (fileName, "r"); + FILE* const fp = g_fopen (fileName, "r"); if (fp == NULL) error (FATAL | PERROR, "cannot open list file \"%s\"", fileName); resize = createTagsFromFileInput (fp, FALSE); Modified: trunk/tagmanager/entry.c =================================================================== --- trunk/tagmanager/entry.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/entry.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -248,7 +248,7 @@ static boolean isTagFile (const char *const filename) { boolean ok = FALSE; /* we assume not unless confirmed */ - FILE *const fp = fopen (filename, "rb"); + FILE *const fp = g_fopen (filename, "rb"); if (fp == NULL && errno == ENOENT) ok = TRUE; @@ -284,12 +284,12 @@ extern void copyFile (const char *const from, const char *const to, const long size) { - FILE* const fromFp = fopen (from, "rb"); + FILE* const fromFp = g_fopen (from, "rb"); if (fromFp == NULL) error (FATAL | PERROR, "cannot open file to copy"); else { - FILE* const toFp = fopen (to, "wb"); + FILE* const toFp = g_fopen (to, "wb"); if (toFp == NULL) error (FATAL | PERROR, "cannot open copy destination"); else @@ -327,17 +327,17 @@ if (Option.append && fileExists) { - TagFile.fp = fopen (TagFile.name, "r+"); + TagFile.fp = g_fopen (TagFile.name, "r+"); if (TagFile.fp != NULL) { TagFile.numTags.prev = updatePseudoTags (TagFile.fp); fclose (TagFile.fp); - TagFile.fp = fopen (TagFile.name, "a+"); + TagFile.fp = g_fopen (TagFile.name, "a+"); } } else { - TagFile.fp = fopen (TagFile.name, "w"); + TagFile.fp = g_fopen (TagFile.name, "w"); if (TagFile.fp != NULL) addPseudoTags (); } Modified: trunk/tagmanager/parse.c =================================================================== --- trunk/tagmanager/parse.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/parse.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -156,7 +156,7 @@ static langType getInterpreterLanguage (const char *const fileName) { langType result = LANG_IGNORE; - FILE* const fp = fopen (fileName, "r"); + FILE* const fp = g_fopen (fileName, "r"); if (fp != NULL) { vString* const vLine = vStringNew (); Modified: trunk/tagmanager/read.c =================================================================== --- trunk/tagmanager/read.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/read.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -250,7 +250,7 @@ File.fp = NULL; } - File.fp = fopen (fileName, openMode); + File.fp = g_fopen (fileName, openMode); if (File.fp == NULL) error (WARNING | PERROR, "cannot open \"%s\"", fileName); else Modified: trunk/tagmanager/regex.c =================================================================== --- trunk/tagmanager/regex.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/regex.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -372,7 +372,7 @@ else { const char* regexfile = parameter + 1; - FILE* const fp = fopen (regexfile, "r"); + FILE* const fp = g_fopen (regexfile, "r"); if (fp == NULL) error (WARNING | PERROR, regexfile); else Modified: trunk/tagmanager/sort.c =================================================================== --- trunk/tagmanager/sort.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/sort.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -36,7 +36,7 @@ extern void catFile (const char *const name) { - FILE *const fp = fopen (name, "r"); + FILE *const fp = g_fopen (name, "r"); if (fp != NULL) { @@ -135,7 +135,7 @@ fp = stdout; else { - fp = fopen (tagFileName (), "w"); + fp = g_fopen (tagFileName (), "w"); if (fp == NULL) failedSort (fp, NULL); } @@ -173,7 +173,7 @@ /* Open the tag file and place its lines into allocated buffers. */ - fp = fopen (tagFileName (), "r"); + fp = g_fopen (tagFileName (), "r"); if (fp == NULL) failedSort (fp, NULL); for (i = 0 ; i < numTags && ! feof (fp) ; ) Modified: trunk/tagmanager/strlist.c =================================================================== --- trunk/tagmanager/strlist.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/strlist.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -91,7 +91,7 @@ extern stringList* stringListNewFromFile (const char* const fileName) { stringList* result = NULL; - FILE* const fp = fopen (fileName, "r"); + FILE* const fp = g_fopen (fileName, "r"); if (fp != NULL) { result = stringListNew (); Modified: trunk/tagmanager/tm_file_entry.c =================================================================== --- trunk/tagmanager/tm_file_entry.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/tm_file_entry.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -62,7 +62,7 @@ struct stat s; #ifndef G_OS_WIN32 - if (0 != lstat(path, &s)) + if (0 != g_lstat(path, &s)) return tm_file_unknown_t; #endif if S_ISDIR(s.st_mode) @@ -163,7 +163,7 @@ return NULL; } g_snprintf(file_name, PATH_MAX, "%s/CVS/Entries", entry->path); - if (0 == stat(file_name, &s)) + if (0 == g_stat(file_name, &s)) { if (S_ISREG(s.st_mode)) { Modified: trunk/tagmanager/tm_project.c =================================================================== --- trunk/tagmanager/tm_project.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/tm_project.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -72,7 +72,7 @@ , tm_project_find_file); } - if ((0 != stat(dir, &s)) || (!S_ISDIR(s.st_mode))) + if ((0 != g_stat(dir, &s)) || (!S_ISDIR(s.st_mode))) { g_warning("%s: Not a valid directory", dir); return FALSE; @@ -88,7 +88,7 @@ project->ignore = s_ignore; project->file_list = NULL; g_snprintf(path, PATH_MAX, "%s/%s", project->dir, TM_FILE_NAME); - if ((0 != stat(path, &s)) || (0 == s.st_size)) + if ((0 != g_stat(path, &s)) || (0 == s.st_size)) force = TRUE; if (FALSE == tm_work_object_init(&(project->work_object), project_class_id, path, force)) @@ -352,7 +352,7 @@ { struct stat s; char *ignore_file = g_strconcat(project->dir, "/", IGNORE_FILE, NULL); - if (0 == stat(ignore_file, &s)) + if (0 == g_stat(ignore_file, &s)) { if (NULL != Option.ignore) stringListClear(Option.ignore); @@ -373,7 +373,7 @@ g_message("Opening project %s", project->work_object.file_name); #endif tm_project_set_ignorelist(project); - if (NULL == (fp = fopen(project->work_object.file_name, "r"))) + if (NULL == (fp = g_fopen(project->work_object.file_name, "r"))) return FALSE; while (NULL != (tag = tm_tag_new_from_file(source_file, fp, 0))) { @@ -443,7 +443,7 @@ if (!project) return FALSE; - if (NULL == (fp = fopen(project->work_object.file_name, "w"))) + if (NULL == (fp = g_fopen(project->work_object.file_name, "w"))) { g_warning("Unable to save project %s", project->work_object.file_name); return FALSE; Modified: trunk/tagmanager/tm_work_object.c =================================================================== --- trunk/tagmanager/tm_work_object.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/tm_work_object.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -14,23 +14,50 @@ #include <stdlib.h> #include <string.h> #include <sys/stat.h> +#ifdef G_OS_WIN32 +# define VC_EXTRALEAN +# define WIN32_LEAN_AND_MEAN +# include <windows.h> /* for GetFullPathName */ +#endif #include "tm_tag.h" #include "tm_work_object.h" static GPtrArray *s_work_object_subclasses = NULL; +#ifdef G_OS_WIN32 +/* realpath implementation for Windows found at http://bugzilla.gnome.org/show_bug.cgi?id=342926 + * this one is better than e.g. liberty's lrealpath because this one uses Win32 API and works + * with special chars within the filename */ +static char *realpath (const char *pathname, char resolved_path[PATH_MAX]) +{ + int size; + + if (resolved_path != NULL) + { + size = GetFullPathNameA (pathname, PATH_MAX, resolved_path, NULL); + if (size > PATH_MAX) + return NULL; + else + return resolved_path; + } + else + { + size = GetFullPathNameA (pathname, 0, NULL, NULL); + resolved_path = g_new0 (char, size); + GetFullPathNameA (pathname, size, resolved_path, NULL); + return resolved_path; + } +} +#endif + gchar *tm_get_real_path(const gchar *file_name) { if (file_name) { gchar path[PATH_MAX+1]; memset(path, '\0', PATH_MAX+1); -#ifdef G_OS_WIN32 - return lrealpath(file_name); -#else realpath(file_name, path); -#endif return g_strdup(path); } else @@ -63,18 +90,18 @@ struct stat s; int status; - if (0 != (status = stat(file_name, &s))) + if (0 != (status = g_stat(file_name, &s))) { if (create) { FILE *f; - if (NULL == (f = fopen(file_name, "a+"))) + if (NULL == (f = g_fopen(file_name, "a+"))) { g_warning("Unable to create file %s", file_name); return FALSE; } fclose(f); - status = stat(file_name, &s); + status = g_stat(file_name, &s); } } if (0 != status) @@ -106,7 +133,7 @@ g_return_val_if_fail(file_name, 0); - if (0 != stat(file_name, &s)) + if (0 != g_stat(file_name, &s)) { /*g_warning("Unable to stat %s", file_name);*/ return (time_t) 0; Modified: trunk/tagmanager/tm_workspace.c =================================================================== --- trunk/tagmanager/tm_workspace.c 2007-07-17 09:14:13 UTC (rev 1713) +++ trunk/tagmanager/tm_workspace.c 2007-07-17 12:04:46 UTC (rev 1714) @@ -145,7 +145,7 @@ FILE *fp; TMTag *tag; - if (NULL == (fp = fopen(tags_file, "r"))) + if (NULL == (fp = g_fopen(tags_file, "r"))) return FALSE; if (NULL == theWorkspace) tm_create_workspace(); @@ -166,7 +166,7 @@ { struct stat file_stat; const char *filename = (const char*)key; - if (stat(filename, &file_stat) == 0) + if (g_stat(filename, &file_stat) == 0) { #ifdef TM_DEBUG g_message ("Hash for '%s' is '%d'\n", filename, file_stat.st_ino); @@ -270,7 +270,7 @@ char *temp_file2 = g_strdup_printf("%s/%d_%ld_2.cpp", P_tmpdir, getpid(), time(NULL)); #endif - if (NULL == (fp = fopen(temp_file, "w"))) + if (NULL == (fp = g_fopen(temp_file, "w"))) return FALSE; includes_files_hash = g_hash_table_new_full (tm_file_inode_hash, @@ -401,7 +401,7 @@ tm_source_file_free(source_file); return FALSE; } - if (NULL == (fp = fopen(tags_file, "w"))) + if (NULL == (fp = g_fopen(tags_file, "w"))) { tm_source_file_free(source_file); return FALSE; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1713] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1713 http://svn.sourceforge.net/geany/?rev=1713&view=rev Author: eht16 Date: 2007-07-17 02:14:13 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Fix creation of wrong hex colours when inserting colours from the colour chooser dialog. Modified Paths: -------------- trunk/ChangeLog trunk/src/win32.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-17 08:39:17 UTC (rev 1712) +++ trunk/ChangeLog 2007-07-17 09:14:13 UTC (rev 1713) @@ -15,6 +15,8 @@ Rename geany.desktop.in to geany.desktop.in.in. Add Makefile.in.in in po/ to get translation status from msgfmt when running make. + * src/win32.c: Fix creation of wrong hex colours when inserting colours + from the colour chooser dialog. 2007-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/win32.c =================================================================== --- trunk/src/win32.c 2007-07-17 08:39:17 UTC (rev 1712) +++ trunk/src/win32.c 2007-07-17 09:14:13 UTC (rev 1713) @@ -392,7 +392,7 @@ if (ChooseColor(&cc)) { rgb_current = cc.rgbResult; - g_snprintf(hex, 11, "#%2X%2X%2X", + g_snprintf(hex, 11, "#%02X%02X%02X", (guint) (utils_scale_round(GetRValue(rgb_current), 255)), (guint) (utils_scale_round(GetGValue(rgb_current), 255)), (guint) (utils_scale_round(GetBValue(rgb_current), 255))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1712] trunk/src
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1712 http://svn.sourceforge.net/geany/?rev=1712&view=rev Author: eht16 Date: 2007-07-17 01:39:17 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Fix compiler warnings. Modified Paths: -------------- trunk/src/editor.c trunk/src/filetypes.c Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-07-17 08:21:19 UTC (rev 1711) +++ trunk/src/editor.c 2007-07-17 08:39:17 UTC (rev 1712) @@ -1530,7 +1530,6 @@ // use single line comment if (cc == NULL || strlen(cc) == 0) { - guint j; gsize tm_len = strlen(GEANY_TOGGLE_MARK); single_line = TRUE; Modified: trunk/src/filetypes.c =================================================================== --- trunk/src/filetypes.c 2007-07-17 08:21:19 UTC (rev 1711) +++ trunk/src/filetypes.c 2007-07-17 08:39:17 UTC (rev 1712) @@ -545,7 +545,7 @@ { filetype_id ft_id; GtkWidget *filetype_menu = lookup_widget(app->window, "set_filetype1_menu"); - GtkWidget *sub_menu; + GtkWidget *sub_menu = filetype_menu; GtkWidget *sub_menu_programming, *sub_menu_scripts, *sub_menu_markup, *sub_menu_misc; GtkWidget *sub_item_programming, *sub_item_scripts, *sub_item_markup, *sub_item_misc; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1711] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1711 http://svn.sourceforge.net/geany/?rev=1711&view=rev Author: eht16 Date: 2007-07-17 01:21:19 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Add --disable-deprecated option to configure to build without deprecated GLib and GTK code. Use intltool to make geany.desktop translatable Rename geany.desktop.in to geany.desktop.in.in. Add Makefile.in.in in po/ to get translation status from msgfmt when running make. Modified Paths: -------------- trunk/ChangeLog trunk/Makefile.am trunk/configure.in trunk/po/POTFILES.in Added Paths: ----------- trunk/geany.desktop.in.in trunk/po/Makefile.in.in Removed Paths: ------------- trunk/geany.desktop.in Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-17 08:11:42 UTC (rev 1710) +++ trunk/ChangeLog 2007-07-17 08:21:19 UTC (rev 1711) @@ -7,6 +7,14 @@ * src/callbacks.c, src/ui_utils.c, src/utils.c: Fix warnings about shadowing local variables. * geany.glade, src/interface.c: Fix typo. + * configure.in, geany.desktop.in.in, Makefile.am, po/Makefile.in.in, + po/POTFILES.in: + Add --disable-deprecated option to configure to build without + deprecated GLib and GTK code. + Use intltool to make geany.desktop translatable + Rename geany.desktop.in to geany.desktop.in.in. + Add Makefile.in.in in po/ to get translation status from msgfmt + when running make. 2007-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/Makefile.am =================================================================== --- trunk/Makefile.am 2007-07-17 08:11:42 UTC (rev 1710) +++ trunk/Makefile.am 2007-07-17 08:21:19 UTC (rev 1711) @@ -30,9 +30,18 @@ README.I18N \ po/intl_stats.sh \ po/LINGUAS \ + intltool-extract.in \ + intltool-merge.in \ + intltool-update.in \ $(SYS_DATA_FILES) \ $(WIN32_BUILD_FILES) +DISTCLEANFILES = \ + geany.desktop \ + intltool-extract \ + intltool-merge \ + intltool-update + uninstall-local: rm -rf $(DESTDIR)$(pkgdatadir); rm $(DESTDIR)$(datadir)/pixmaps/geany.png; @@ -87,3 +96,8 @@ Applicationsdir = $(datadir)/applications Applications_DATA = geany.desktop logodir = $(datadir)/pixmaps + +desktopdir = $(datadir)/applications +desktop_in_files = geany.desktop.in +desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ Modified: trunk/configure.in =================================================================== --- trunk/configure.in 2007-07-17 08:11:42 UTC (rev 1710) +++ trunk/configure.in 2007-07-17 08:21:19 UTC (rev 1711) @@ -4,10 +4,10 @@ AC_INIT(configure.in) AM_INIT_AUTOMAKE(geany, 0.12) - AM_CONFIG_HEADER(config.h) +# AC_USE_SYSTEM_EXTENSIONS combines AC_MINIX, AC_AIX and AC_GNU_SOURCE +AC_USE_SYSTEM_EXTENSIONS -AC_ISC_POSIX AC_PROG_CC AM_CONDITIONAL(IS_COMPILER_GCC,test x$SSC == x) @@ -15,10 +15,11 @@ AC_HEADER_STDC AC_PROG_CXX AC_PROG_CPP -AC_PROG_RANLIB +#AC_PROG_RANLIB AC_PROG_INSTALL AC_PROG_LN_S AC_PROG_MAKE_SET +AC_PROG_INTLTOOL # for plugins AC_DISABLE_STATIC @@ -79,6 +80,10 @@ AC_SUBST(GTK_CFLAGS) AC_SUBST(GTK_LIBS) +# --disable-deprecated switch for GTK2 purification +AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ], + [GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], []) + # socket support AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]), [want_socket="$enableval"], [want_socket="yes"]) @@ -181,7 +186,7 @@ doc/Makefile doc/geany.1 geany.spec -geany.desktop +geany.desktop.in ]) echo "----------------------------------------" Deleted: trunk/geany.desktop.in =================================================================== --- trunk/geany.desktop.in 2007-07-17 08:11:42 UTC (rev 1710) +++ trunk/geany.desktop.in 2007-07-17 08:21:19 UTC (rev 1711) @@ -1,17 +0,0 @@ -[Desktop Entry] -Name=Geany -GenericName=Integrated Development Environment -GenericName[de]=Integrierte Entwicklungsumgebung -Comment=A fast and lightweight IDE using GTK2 -Comment[de]=Eine kleine und schnelle integrierte Entwicklungsumgebung -Comment[pl]=Szybkie i lekkie IDE korzystające z GTK+2 -Exec=geany %F -Icon=@GEANY_PIXMAPS_DIR@/geany.png -Terminal=false -Type=Application -Categories=Application;GTK;Development;IDE; -Encoding=UTF-8 -MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff; -# currently false, changes perhaps in the future -StartupNotify=false -Version=1.1 Added: trunk/geany.desktop.in.in =================================================================== --- trunk/geany.desktop.in.in (rev 0) +++ trunk/geany.desktop.in.in 2007-07-17 08:21:19 UTC (rev 1711) @@ -0,0 +1,14 @@ +[Desktop Entry] +_Name=Geany +_GenericName=Integrated Development Environment +_Comment=A fast and lightweight IDE using GTK2 +Exec=geany %F +Icon=@GEANY_PIXMAPS_DIR@/geany.png +Terminal=false +Type=Application +Categories=Application;GTK;Development;IDE; +Encoding=UTF-8 +MimeType=text/plain;text/x-chdr;text/x-csrc;text/x-c++hdr;text/x-c++src;text/x-java;text/x-dsrc;text/x-pascal;text/x-perl;text/x-python;application/x-php;application/x-httpd-php*;application/xml;text/html;text/css;text/x-sql;text/x-diff; +# currently false, changes perhaps in the future +StartupNotify=false +Version=1.1 Added: trunk/po/Makefile.in.in =================================================================== --- trunk/po/Makefile.in.in (rev 0) +++ trunk/po/Makefile.in.in 2007-07-17 08:21:19 UTC (rev 1711) @@ -0,0 +1,219 @@ +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <drepper(a)gnu.ai.mit.edu> +# +# This file file be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU Public License +# but which still want to provide support for the GNU gettext functionality. +# Please note that the actual code is *not* freely available. +# +# - Modified by Owen Taylor <otaylor(a)redhat.com> to use GETTEXT_PACKAGE +# instead of PACKAGE and to look for po2tbl in ./ not in intl/ +# +# - Modified by jacob berkman <jacob(a)ximian.com> to install +# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize +# +# - Modified by Rodney Dawes <dobey(a)novell.com> for use with intltool +# +# We have the following line for use by intltoolize: +# INTLTOOL_MAKEFILE + +GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ +PACKAGE = @PACKAGE@ +VERSION = @VERSION@ + +SHELL = /bin/sh + +srcdir = @srcdir@ +top_srcdir = @top_srcdir@ +top_builddir = @top_builddir@ +VPATH = @srcdir@ + +prefix = @prefix@ +exec_prefix = @exec_prefix@ +datadir = @datadir@ +datarootdir = @datarootdir@ +libdir = @libdir@ +DATADIRNAME = @DATADIRNAME@ +itlocaledir = $(prefix)/$(DATADIRNAME)/locale +subdir = po +install_sh = @install_sh@ +# Automake >= 1.8 provides @mkdir_p@. +# Until it can be supposed, use the safe fallback: +mkdir_p = $(install_sh) -d + +INSTALL = @INSTALL@ +INSTALL_DATA = @INSTALL_DATA@ + +GMSGFMT = @GMSGFMT@ +MSGFMT = @MSGFMT@ +XGETTEXT_ARGS = @XGETTEXT_ARGS@ +XGETTEXT = @XGETTEXT@ $(XGETTEXT_ARGS) +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +MSGMERGE = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --dist +GENPOT = XGETTEXT_ARGS="$(XGETTEXT_ARGS)" INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) srcdir=$(srcdir) $(INTLTOOL_UPDATE) --gettext-package $(GETTEXT_PACKAGE) --pot + +ALL_LINGUAS = @ALL_LINGUAS@ + +PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi) + +USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi) + +USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done) + +POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done) + +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES) +EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS + +POTFILES = \ +# This comment gets stripped out + +CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done) + +.SUFFIXES: +.SUFFIXES: .po .pox .gmo .mo .msg .cat + +.po.pox: + $(MAKE) $(GETTEXT_PACKAGE).pot + $(MSGMERGE) $< $(GETTEXT_PACKAGE).pot -o $*.pox + +.po.mo: + $(MSGFMT) -o $@ $< + +.po.gmo: + file=`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< + +.po.cat: + sed -f ../intl/po2msg.sed < $< > $*.msg \ + && rm -f $@ && gencat $@ $*.msg + + +all: all-@USE_NLS@ + +all-yes: $(CATALOGS) +all-no: + +$(GETTEXT_PACKAGE).pot: $(POTFILES) + $(GENPOT) + +install: install-data +install-data: install-data-@USE_NLS@ +install-data-no: all +install-data-yes: all + $(mkdir_p) $(DESTDIR)$(itlocaledir) + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \ + $(mkdir_p) $$dir; \ + if test -r $$lang.gmo; then \ + $(INSTALL_DATA) $$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $$lang.gmo as $$dir/$(GETTEXT_PACKAGE).mo"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo $$dir/$(GETTEXT_PACKAGE).mo; \ + echo "installing $(srcdir)/$$lang.gmo as" \ + "$$dir/$(GETTEXT_PACKAGE).mo"; \ + fi; \ + if test -r $$lang.gmo.m; then \ + $(INSTALL_DATA) $$lang.gmo.m $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $$lang.gmo.m as $$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + if test -r $(srcdir)/$$lang.gmo.m ; then \ + $(INSTALL_DATA) $(srcdir)/$$lang.gmo.m \ + $$dir/$(GETTEXT_PACKAGE).mo.m; \ + echo "installing $(srcdir)/$$lang.gmo.m as" \ + "$$dir/$(GETTEXT_PACKAGE).mo.m"; \ + else \ + true; \ + fi; \ + fi; \ + done + +# Empty stubs to satisfy archaic automake needs +dvi info tags TAGS ID: + +# Define this as empty until I found a useful application. +installcheck: + +uninstall: + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \ + rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \ + done + +check: all $(GETTEXT_PACKAGE).pot + rm -f missing notexist + srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m + if [ -r missing -o -r notexist ]; then \ + exit 1; \ + fi + +mostlyclean: + rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp + rm -f .intltool-merge-cache + +clean: mostlyclean + +distclean: clean + rm -f Makefile Makefile.in POTFILES stamp-it + rm -f *.mo *.msg *.cat *.cat.m *.gmo + +maintainer-clean: distclean + @echo "This command is intended for maintainers to use;" + @echo "it deletes files that may require special tools to rebuild." + rm -f Makefile.in.in + +distdir = ../$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: $(DISTFILES) + dists="$(DISTFILES)"; \ + extra_dists="$(EXTRA_DISTFILES)"; \ + for file in $$extra_dists; do \ + test -f $(srcdir)/$$file && dists="$$dists $(srcdir)/$$file"; \ + done; \ + for file in $$dists; do \ + test -f $$file || file="$(srcdir)/$$file"; \ + ln $$file $(distdir) 2> /dev/null \ + || cp -p $$file $(distdir); \ + done + +update-po: Makefile + $(MAKE) $(GETTEXT_PACKAGE).pot + tmpdir=`pwd`; \ + linguas="$(USE_LINGUAS)"; \ + for lang in $$linguas; do \ + echo "$$lang:"; \ + result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \ + if $$result; then \ + if cmp $(srcdir)/$$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ + rm -f $$tmpdir/$$lang.new.po; \ + else \ + if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ + :; \ + else \ + echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ + rm -f $$tmpdir/$$lang.new.po; \ + exit 1; \ + fi; \ + fi; \ + else \ + echo "msgmerge for $$lang.gmo failed!"; \ + rm -f $$tmpdir/$$lang.new.po; \ + fi; \ + done + +Makefile POTFILES: stamp-it + @if test ! -f $@; then \ + rm -f stamp-it; \ + $(MAKE) stamp-it; \ + fi + +stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ + && CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \ + $(SHELL) ./config.status + +# Tell versions [3.59,3.63) of GNU make not to export all variables. +# Otherwise a system limit (for SysV at least) may be exceeded. +.NOEXPORT: Modified: trunk/po/POTFILES.in =================================================================== --- trunk/po/POTFILES.in 2007-07-17 08:11:42 UTC (rev 1710) +++ trunk/po/POTFILES.in 2007-07-17 08:21:19 UTC (rev 1711) @@ -1,5 +1,6 @@ # List of source files containing translatable strings. +geany.desktop.in src/about.c src/build.c src/callbacks.c This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1710] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1710 http://svn.sourceforge.net/geany/?rev=1710&view=rev Author: eht16 Date: 2007-07-17 01:11:42 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Fix typo. Modified Paths: -------------- trunk/ChangeLog trunk/geany.glade trunk/src/interface.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-17 08:10:29 UTC (rev 1709) +++ trunk/ChangeLog 2007-07-17 08:11:42 UTC (rev 1710) @@ -6,6 +6,7 @@ Fix a typo in is_doc_comment_char(). * src/callbacks.c, src/ui_utils.c, src/utils.c: Fix warnings about shadowing local variables. + * geany.glade, src/interface.c: Fix typo. 2007-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/geany.glade =================================================================== --- trunk/geany.glade 2007-07-17 08:10:29 UTC (rev 1709) +++ trunk/geany.glade 2007-07-17 08:11:42 UTC (rev 1710) @@ -3222,7 +3222,7 @@ <child> <widget class="GtkCheckButton" id="check_beep"> <property name="visible">True</property> - <property name="tooltip" translatable="yes">Whether to beep if an error occured or when the compilation process has finished.</property> + <property name="tooltip" translatable="yes">Whether to beep if an error occurred or when the compilation process has finished.</property> <property name="can_focus">True</property> <property name="label" translatable="yes">Beep on errors or when compilation has finished</property> <property name="use_underline">True</property> Modified: trunk/src/interface.c =================================================================== --- trunk/src/interface.c 2007-07-17 08:10:29 UTC (rev 1709) +++ trunk/src/interface.c 2007-07-17 08:11:42 UTC (rev 1710) @@ -2741,7 +2741,7 @@ check_beep = gtk_check_button_new_with_mnemonic (_("Beep on errors or when compilation has finished")); gtk_widget_show (check_beep); gtk_box_pack_start (GTK_BOX (vbox21), check_beep, FALSE, FALSE, 0); - gtk_tooltips_set_tip (tooltips, check_beep, _("Whether to beep if an error occured or when the compilation process has finished."), NULL); + gtk_tooltips_set_tip (tooltips, check_beep, _("Whether to beep if an error occurred or when the compilation process has finished."), NULL); gtk_button_set_focus_on_click (GTK_BUTTON (check_beep), FALSE); check_switch_pages = gtk_check_button_new_with_mnemonic (_("Switch to status message list at new message")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1709] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1709 http://svn.sourceforge.net/geany/?rev=1709&view=rev Author: eht16 Date: 2007-07-17 01:10:29 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Fix warnings about shadowing local variables. Modified Paths: -------------- trunk/ChangeLog trunk/src/callbacks.c trunk/src/ui_utils.c trunk/src/utils.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-17 08:09:15 UTC (rev 1708) +++ trunk/ChangeLog 2007-07-17 08:10:29 UTC (rev 1709) @@ -4,6 +4,8 @@ Improve selection handling when decreasing indent by one space. Avoid using SCI_DELETEBACK for simple text removal. Fix a typo in is_doc_comment_char(). + * src/callbacks.c, src/ui_utils.c, src/utils.c: + Fix warnings about shadowing local variables. 2007-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> Modified: trunk/src/callbacks.c =================================================================== --- trunk/src/callbacks.c 2007-07-17 08:09:15 UTC (rev 1708) +++ trunk/src/callbacks.c 2007-07-17 08:10:29 UTC (rev 1709) @@ -474,7 +474,7 @@ gpointer user_data) { gint idx = document_get_cur_idx(); - gchar *basename; + gchar *base_name; gint i = GPOINTER_TO_INT(user_data); gchar *charset = NULL; @@ -486,16 +486,16 @@ charset = encodings[i].charset; } - basename = g_path_get_basename(doc_list[idx].file_name); + base_name = g_path_get_basename(doc_list[idx].file_name); if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, _("Any unsaved changes will be lost."), - _("Are you sure you want to reload '%s'?"), basename)) + _("Are you sure you want to reload '%s'?"), base_name)) { document_reload_file(idx, charset); if (charset != NULL) ui_update_statusbar(idx, -1); } - g_free(basename); + g_free(base_name); } Modified: trunk/src/ui_utils.c =================================================================== --- trunk/src/ui_utils.c 2007-07-17 08:09:15 UTC (rev 1708) +++ trunk/src/ui_utils.c 2007-07-17 08:10:29 UTC (rev 1709) @@ -167,13 +167,13 @@ g_string_append(str, DOC_FILENAME(idx)); else { - gchar *basename = g_path_get_basename(DOC_FILENAME(idx)); + gchar *base_name = g_path_get_basename(DOC_FILENAME(idx)); gchar *dirname = g_path_get_dirname(DOC_FILENAME(idx)); - g_string_append(str, basename); + g_string_append(str, base_name); g_string_append(str, " - "); g_string_append(str, dirname ? dirname : ""); - g_free(basename); + g_free(base_name); g_free(dirname); } g_string_append(str, " - "); Modified: trunk/src/utils.c =================================================================== --- trunk/src/utils.c 2007-07-17 08:09:15 UTC (rev 1708) +++ trunk/src/utils.c 2007-07-17 08:10:29 UTC (rev 1709) @@ -348,12 +348,12 @@ } else if (doc_list[idx].mtime < st.st_mtime) { - gchar *basename = g_path_get_basename(doc_list[idx].file_name); + gchar *base_name = g_path_get_basename(doc_list[idx].file_name); if (dialogs_show_question_full(NULL, _("_Reload"), GTK_STOCK_CANCEL, _("Do you want to reload it?"), _("The file '%s' on the disk is more recent than\n" - "the current buffer."), basename)) + "the current buffer."), base_name)) { document_reload_file(idx, NULL); doc_list[idx].last_check = t; @@ -361,7 +361,7 @@ else doc_list[idx].mtime = st.st_mtime; - g_free(basename); + g_free(base_name); ret = TRUE; // file has changed } g_free(locale_filename); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

SF.net SVN: geany: [1708] trunk
by eht16＠users.sourceforge.net 17 Jul '07

17 Jul '07

Revision: 1708 http://svn.sourceforge.net/geany/?rev=1708&view=rev Author: eht16 Date: 2007-07-17 01:09:15 -0700 (Tue, 17 Jul 2007) Log Message: ----------- Improve selection handling when decreasing indent by one space. Avoid using SCI_DELETEBACK for simple text removal. Fix a typo in is_doc_comment_char(). Modified Paths: -------------- trunk/ChangeLog trunk/src/editor.c Modified: trunk/ChangeLog =================================================================== --- trunk/ChangeLog 2007-07-16 20:16:28 UTC (rev 1707) +++ trunk/ChangeLog 2007-07-17 08:09:15 UTC (rev 1708) @@ -1,3 +1,11 @@ +2007-07-17 Enrico Tröger <enrico.troeger(a)uvena.de> + + * src/editor.c: + Improve selection handling when decreasing indent by one space. + Avoid using SCI_DELETEBACK for simple text removal. + Fix a typo in is_doc_comment_char(). + + 2007-07-16 Enrico Tröger <enrico.troeger(a)uvena.de> * src/document.c, src/editor.c: Modified: trunk/src/editor.c =================================================================== --- trunk/src/editor.c 2007-07-16 20:16:28 UTC (rev 1707) +++ trunk/src/editor.c 2007-07-17 08:09:15 UTC (rev 1708) @@ -1549,8 +1549,8 @@ continue; } - SSM(doc_list[idx].sci, SCI_GOTOPOS, line_start + x + co_len, 0); - for (j = 0; j < co_len; j++) SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + SSM(doc_list[idx].sci, SCI_SETSEL, line_start + x, line_start + x + co_len); + sci_replace_sel(doc_list[idx].sci, ""); count++; } // use multi line comment @@ -1952,7 +1952,7 @@ static gboolean is_doc_comment_char(gchar c, gint lexer) { - if (c == '*' && (lexer = SCLEX_HTML || lexer == SCLEX_CPP)) + if (c == '*' && (lexer == SCLEX_HTML || lexer == SCLEX_CPP)) return TRUE; else if ((c == '*' || c == '+') && lexer == SCLEX_D) return TRUE; @@ -2415,7 +2415,7 @@ void editor_auto_line_indentation(gint idx, gint pos) { gint i, first_line, last_line; - gint first_sel_start, first_sel_end, sel_start, sel_end; + gint first_sel_start, first_sel_end, sel_start = 0, sel_end = 0; g_return_if_fail(DOC_IDX_VALID(idx)); @@ -2450,7 +2450,7 @@ if (sel_start < sel_end) { SSM(doc_list[idx].sci, SCI_SETSEL, sel_start, sel_end); - SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + sci_replace_sel(doc_list[idx].sci, ""); } sci_insert_text(doc_list[idx].sci, sel_start, indent); } @@ -2500,8 +2500,8 @@ if (sci_get_char_at(doc_list[idx].sci, indentation_end) == ' ') { - sci_set_current_position(doc_list[idx].sci, indentation_end + 1, FALSE); - SSM(doc_list[idx].sci, SCI_DELETEBACK, 0, 0); + SSM(doc_list[idx].sci, SCI_SETSEL, indentation_end, indentation_end + 1); + sci_replace_sel(doc_list[idx].sci, ""); count--; if (i == first_line) first_line_offset = -1; @@ -2519,7 +2519,12 @@ // set cursor position if (sel_start < sel_end) { - sci_set_selection_start(doc_list[idx].sci, sel_start + first_line_offset); + gint start = sel_start + first_line_offset; + if (first_line_offset < 0) + start = MAX(sel_start + first_line_offset, + SSM(doc_list[idx].sci, SCI_POSITIONFROMLINE, first_line, 0)); + + sci_set_selection_start(doc_list[idx].sci, start); sci_set_selection_end(doc_list[idx].sci, sel_end + count); } else This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

1 0

← Newer
1
2
3
4
5
6
7
8
9
...
12
Older →

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2007