Plugins-Commits March 2018

plugins-commits@lists.geany.org

1 participants
33 discussions

[geany/geany-plugins] 303b48: Merge pull request #722 from LarsGit223/fix-live-update
by Frank Lanitz 11 Mar '18

11 Mar '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 11 Mar 2018 12:47:22 UTC Commit: 303b48a1c1c93e823a763d2207f2b422f3668fa2 https://github.com/geany/geany-plugins/commit/303b48a1c1c93e823a763d2207f2b… Log Message: ----------- Merge pull request #722 from LarsGit223/fix-live-update workbench: fix broken live-update Modified Paths: -------------- workbench/src/wb_project.c Modified: workbench/src/wb_project.c 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -824,19 +824,23 @@ static void wb_project_dir_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED g g_hash_table_iter_init(&iter, root->file_table); while (g_hash_table_iter_next(&iter, &key, &value)) { + TMSourceFile *sf; + + sf = NULL; if (g_file_test(key, G_FILE_TEST_IS_REGULAR)) { - TMSourceFile *sf; gchar *utf8_path = key; gchar *locale_path = utils_get_locale_from_utf8(utf8_path); sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); if (sf && !document_find_by_filename(utf8_path)) g_ptr_array_add(source_files, sf); - g_hash_table_insert(file_table, g_strdup(utf8_path), sf); g_free(locale_path); } + + /* Add all files to the file-table (files and dirs)! */ + g_hash_table_insert(file_table, g_strdup(key), sf); } g_hash_table_destroy(root->file_table); root->file_table = file_table; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 909f1f: Merge pull request #723 from LarsGit223/tb-gtk-check
by Frank Lanitz 11 Mar '18

11 Mar '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sun, 11 Mar 2018 12:32:48 UTC Commit: 909f1faec42bbb98cdb34f694dc2237af3bc569e https://github.com/geany/geany-plugins/commit/909f1faec42bbb98cdb34f694dc22… Log Message: ----------- Merge pull request #723 from LarsGit223/tb-gtk-check treebrowser: removed needless Gtk version checks Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 25 lines changed, 2 insertions(+), 23 deletions(-) =================================================================== @@ -138,11 +138,7 @@ PLUGIN_SET_TRANSLATABLE_INFO( static GList* _gtk_cell_layout_get_cells(GtkTreeViewColumn *column) { -#if GTK_CHECK_VERSION(2, 12, 0) return gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column)); -#else - return gtk_tree_view_column_get_cell_renderers(column); -#endif } @@ -206,7 +202,6 @@ utils_pixbuf_from_stock(const gchar *stock_id) static GdkPixbuf * utils_pixbuf_from_path(gchar *path) { -#if GTK_CHECK_VERSION(2, 14, 0) GIcon *icon; GdkPixbuf *ret = NULL; GtkIconInfo *info; @@ -237,11 +232,6 @@ utils_pixbuf_from_path(gchar *path) gtk_icon_info_free(info); } return ret; -#else - return utils_pixbuf_from_stock(g_file_test(path, G_FILE_TEST_IS_DIR) - ? GTK_STOCK_DIRECTORY - : GTK_STOCK_FILE); -#endif } @@ -1706,15 +1696,11 @@ create_view_and_model(void) ui_widget_modify_font_from_string(view, geany->interface_prefs->tagbar_font); -#if GTK_CHECK_VERSION(2, 10, 0) g_object_set(view, "has-tooltip", TRUE, "tooltip-column", TREEBROWSER_COLUMN_URI, NULL); -#endif gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_SINGLE); -#if GTK_CHECK_VERSION(2, 10, 0) gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(view), CONFIG_SHOW_TREE_LINES); -#endif treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); @@ -1783,11 +1769,8 @@ create_sidebar(void) gtk_widget_set_tooltip_text(filter, _("Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' reverse try for example this '!;*.c;*.h;*.cpp'")); - if (gtk_check_version(2, 15, 2) == NULL) - { - ui_entry_add_clear_icon(GTK_ENTRY(filter)); - g_signal_connect(filter, "icon-release", G_CALLBACK(on_filter_clear), NULL); - } + ui_entry_add_clear_icon(GTK_ENTRY(filter)); + g_signal_connect(filter, "icon-release", G_CALLBACK(on_filter_clear), NULL); gtk_widget_set_tooltip_text(addressbar, _("Addressbar for example '/projects/my-project'")); @@ -1936,9 +1919,7 @@ on_configure_response(GtkDialog *dialog, gint response, gpointer user_data) if (save_settings() == TRUE) { -#if GTK_CHECK_VERSION(2, 10, 0) gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview), CONFIG_SHOW_TREE_LINES); -#endif treebrowser_chroot(addressbar_last_address); if (CONFIG_SHOW_BOOKMARKS) treebrowser_load_bookmarks(); @@ -2052,9 +2033,7 @@ plugin_configure(GtkDialog *dialog) configure_widgets.SHOW_TREE_LINES = gtk_check_button_new_with_label(_("Show tree lines")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_TREE_LINES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES), CONFIG_SHOW_TREE_LINES); -#if GTK_CHECK_VERSION(2, 10, 0) gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_TREE_LINES, FALSE, FALSE, 0); -#endif configure_widgets.SHOW_BOOKMARKS = gtk_check_button_new_with_label(_("Show bookmarks")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_BOOKMARKS), FALSE); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] bb1904: scope: new-maintainer: LarsGit223
by LarsDW223 11 Mar '18

11 Mar '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Sun, 11 Mar 2018 12:10:15 UTC Commit: bb19049620a7daf6578f75d5e83a5bfe1f5ce209 https://github.com/geany/geany-plugins/commit/bb19049620a7daf6578f75d5e83a5… Log Message: ----------- scope: new-maintainer: LarsGit223 Modified Paths: -------------- scope/src/scope.c Modified: scope/src/scope.c 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -31,10 +31,8 @@ GeanyData *geany_data; PLUGIN_VERSION_CHECK(224) PLUGIN_SET_TRANSLATABLE_INFO(LOCALEDIR, GETTEXT_PACKAGE, _("Scope Debugger"), - _("Relatively simple GDB front-end." - "\nThis plugin currently has no maintainer. Would you like to help " - "by contributing to this plugin?"), "0.94", - "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>") + _("Relatively simple GDB front-end."), "0.94", + "Dimitar Toshkov Zhekov <dimitar.zhekov(a)gmail.com>, LarsGit223") /* Keybinding(s) */ enum -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 57f1c9: treebrowser: removed needless Gtk version checks
by LarsDW223 11 Mar '18

11 Mar '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Sun, 11 Mar 2018 10:50:03 UTC Commit: 57f1c93f83b242e5a495b3b289bc77ee739294db https://github.com/geany/geany-plugins/commit/57f1c93f83b242e5a495b3b289bc7… Log Message: ----------- treebrowser: removed needless Gtk version checks Geany depends on Gtk version 2.24 so all version checks for a lower version than 2.24 are needless. Modified Paths: -------------- treebrowser/src/treebrowser.c Modified: treebrowser/src/treebrowser.c 25 lines changed, 2 insertions(+), 23 deletions(-) =================================================================== @@ -138,11 +138,7 @@ PLUGIN_SET_TRANSLATABLE_INFO( static GList* _gtk_cell_layout_get_cells(GtkTreeViewColumn *column) { -#if GTK_CHECK_VERSION(2, 12, 0) return gtk_cell_layout_get_cells(GTK_CELL_LAYOUT(column)); -#else - return gtk_tree_view_column_get_cell_renderers(column); -#endif } @@ -206,7 +202,6 @@ utils_pixbuf_from_stock(const gchar *stock_id) static GdkPixbuf * utils_pixbuf_from_path(gchar *path) { -#if GTK_CHECK_VERSION(2, 14, 0) GIcon *icon; GdkPixbuf *ret = NULL; GtkIconInfo *info; @@ -237,11 +232,6 @@ utils_pixbuf_from_path(gchar *path) gtk_icon_info_free(info); } return ret; -#else - return utils_pixbuf_from_stock(g_file_test(path, G_FILE_TEST_IS_DIR) - ? GTK_STOCK_DIRECTORY - : GTK_STOCK_FILE); -#endif } @@ -1706,15 +1696,11 @@ create_view_and_model(void) ui_widget_modify_font_from_string(view, geany->interface_prefs->tagbar_font); -#if GTK_CHECK_VERSION(2, 10, 0) g_object_set(view, "has-tooltip", TRUE, "tooltip-column", TREEBROWSER_COLUMN_URI, NULL); -#endif gtk_tree_selection_set_mode(gtk_tree_view_get_selection(GTK_TREE_VIEW(view)), GTK_SELECTION_SINGLE); -#if GTK_CHECK_VERSION(2, 10, 0) gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(view), CONFIG_SHOW_TREE_LINES); -#endif treestore = gtk_tree_store_new(TREEBROWSER_COLUMNC, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_INT); @@ -1783,11 +1769,8 @@ create_sidebar(void) gtk_widget_set_tooltip_text(filter, _("Filter (*.c;*.h;*.cpp), and if you want temporary filter using the '!' reverse try for example this '!;*.c;*.h;*.cpp'")); - if (gtk_check_version(2, 15, 2) == NULL) - { - ui_entry_add_clear_icon(GTK_ENTRY(filter)); - g_signal_connect(filter, "icon-release", G_CALLBACK(on_filter_clear), NULL); - } + ui_entry_add_clear_icon(GTK_ENTRY(filter)); + g_signal_connect(filter, "icon-release", G_CALLBACK(on_filter_clear), NULL); gtk_widget_set_tooltip_text(addressbar, _("Addressbar for example '/projects/my-project'")); @@ -1936,9 +1919,7 @@ on_configure_response(GtkDialog *dialog, gint response, gpointer user_data) if (save_settings() == TRUE) { -#if GTK_CHECK_VERSION(2, 10, 0) gtk_tree_view_set_enable_tree_lines(GTK_TREE_VIEW(treeview), CONFIG_SHOW_TREE_LINES); -#endif treebrowser_chroot(addressbar_last_address); if (CONFIG_SHOW_BOOKMARKS) treebrowser_load_bookmarks(); @@ -2052,9 +2033,7 @@ plugin_configure(GtkDialog *dialog) configure_widgets.SHOW_TREE_LINES = gtk_check_button_new_with_label(_("Show tree lines")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_TREE_LINES), FALSE); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(configure_widgets.SHOW_TREE_LINES), CONFIG_SHOW_TREE_LINES); -#if GTK_CHECK_VERSION(2, 10, 0) gtk_box_pack_start(GTK_BOX(vbox), configure_widgets.SHOW_TREE_LINES, FALSE, FALSE, 0); -#endif configure_widgets.SHOW_BOOKMARKS = gtk_check_button_new_with_label(_("Show bookmarks")); gtk_button_set_focus_on_click(GTK_BUTTON(configure_widgets.SHOW_BOOKMARKS), FALSE); -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 93f372: workbench: fix broken live-update
by LarsDW223 10 Mar '18

10 Mar '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Sat, 10 Mar 2018 13:08:23 UTC Commit: 93f372ba3f267b77aadab423bcd130afa293d97f https://github.com/geany/geany-plugins/commit/93f372ba3f267b77aadab423bcd13… Log Message: ----------- workbench: fix broken live-update This fixes the broken live-update. The feature did not work since commit dcc37957e917a2e8c2f3e5d483c9a832eceff1e0. The reason was that the sub-directories were not added to the file-table and so no file monitor was created for them. The live-update only worked for the main directories but not for their sub-directories. Modified Paths: -------------- workbench/src/wb_project.c Modified: workbench/src/wb_project.c 8 lines changed, 6 insertions(+), 2 deletions(-) =================================================================== @@ -824,19 +824,23 @@ static void wb_project_dir_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED g g_hash_table_iter_init(&iter, root->file_table); while (g_hash_table_iter_next(&iter, &key, &value)) { + TMSourceFile *sf; + + sf = NULL; if (g_file_test(key, G_FILE_TEST_IS_REGULAR)) { - TMSourceFile *sf; gchar *utf8_path = key; gchar *locale_path = utils_get_locale_from_utf8(utf8_path); sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); if (sf && !document_find_by_filename(utf8_path)) g_ptr_array_add(source_files, sf); - g_hash_table_insert(file_table, g_strdup(utf8_path), sf); g_free(locale_path); } + + /* Add all files to the file-table (files and dirs)! */ + g_hash_table_insert(file_table, g_strdup(key), sf); } g_hash_table_destroy(root->file_table); root->file_table = file_table; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 05ddb1: Merge pull request #715 from LarsGit223/wb-dbgmsg1
by Frank Lanitz 10 Mar '18

10 Mar '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 10 Mar 2018 05:41:13 UTC Commit: 05ddb19640d1092646b6c7b2745444eec4624cbe https://github.com/geany/geany-plugins/commit/05ddb19640d1092646b6c7b274544… Log Message: ----------- Merge pull request #715 from LarsGit223/wb-dbgmsg1 workbench: fixed tag-manager warning. Fixes #713. Modified Paths: -------------- workbench/src/wb_project.c Modified: workbench/src/wb_project.c 19 lines changed, 11 insertions(+), 8 deletions(-) =================================================================== @@ -824,16 +824,19 @@ static void wb_project_dir_regenerate_tags(WB_PROJECT_DIR *root, G_GNUC_UNUSED g g_hash_table_iter_init(&iter, root->file_table); while (g_hash_table_iter_next(&iter, &key, &value)) { - TMSourceFile *sf; - gchar *utf8_path = key; - gchar *locale_path = utils_get_locale_from_utf8(utf8_path); + if (g_file_test(key, G_FILE_TEST_IS_REGULAR)) + { + TMSourceFile *sf; + gchar *utf8_path = key; + gchar *locale_path = utils_get_locale_from_utf8(utf8_path); - sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); - if (sf && !document_find_by_filename(utf8_path)) - g_ptr_array_add(source_files, sf); + sf = tm_source_file_new(locale_path, filetypes_detect(utf8_path)->name); + if (sf && !document_find_by_filename(utf8_path)) + g_ptr_array_add(source_files, sf); - g_hash_table_insert(file_table, g_strdup(utf8_path), sf); - g_free(locale_path); + g_hash_table_insert(file_table, g_strdup(utf8_path), sf); + g_free(locale_path); + } } g_hash_table_destroy(root->file_table); root->file_table = file_table; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] fb6fcc: Merge pull request #719 from LarsGit223/wb-simple-events
by Frank Lanitz 10 Mar '18

10 Mar '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 10 Mar 2018 05:40:44 UTC Commit: fb6fccbf674b2c6ddc92b3c5813c42871e99c361 https://github.com/geany/geany-plugins/commit/fb6fccbf674b2c6ddc92b3c5813c4… Log Message: ----------- Merge pull request #719 from LarsGit223/wb-simple-events workbench: use simple/old file monitor events only Modified Paths: -------------- build/workbench.m4 workbench/src/dialogs.c workbench/src/plugin_main.c workbench/src/wb_monitor.c workbench/src/wb_monitor.h workbench/src/wb_project.c workbench/src/workbench.c Modified: build/workbench.m4 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -3,11 +3,6 @@ AC_DEFUN([GP_CHECK_WORKBENCH], GP_ARG_DISABLE([Workbench], [auto]) GP_CHECK_UTILSLIB([Workbench]) - PKG_CHECK_MODULES([GIO], [gio-2.0], - [AC_DEFINE([HAVE_GIO], 1, [Whether we have GIO]) - have_gio=yes], - [have_gio=no]) - GP_COMMIT_PLUGIN_STATUS([Workbench]) AC_CONFIG_FILES([ workbench/Makefile Modified: workbench/src/dialogs.c 9 lines changed, 0 insertions(+), 9 deletions(-) =================================================================== @@ -440,19 +440,10 @@ gboolean dialogs_workbench_settings(WORKBENCH *workbench) w_enable_live_update = gtk_check_button_new_with_mnemonic(_("_Enable live update")); ui_table_add_row(GTK_TABLE(table), 1, w_enable_live_update, NULL); -#ifdef __WB_LIVE_UPDATE gtk_widget_set_tooltip_text(w_enable_live_update, _("If the option is activated (default), then the list of files and the sidebar" " will be updated automatically if a file or directory is created, removed or renamed." "A manual re-scan is not required if the option is enabled.")); -#else - gtk_widget_set_sensitive(w_enable_live_update, FALSE); - gtk_widget_set_tooltip_text(w_enable_live_update, - _("If the option is activated (default), then the list of files and the sidebar" - " will be updated automatically if a file or directory is created, removed or renamed." - "A manual re-scan is not required if the option is enabled.\n\n" - "This feature has been disabled because it is not available on your system.")); -#endif enable_live_update_old = workbench_get_enable_live_update(workbench); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w_enable_live_update), enable_live_update_old); Modified: workbench/src/plugin_main.c 2 lines changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -130,7 +130,7 @@ void geany_load_module(GeanyPlugin *plugin) /* Set metadata */ plugin->info->name = _("Workbench"); plugin->info->description = _("Manage and customize multiple projects."); - plugin->info->version = "1.03"; + plugin->info->version = "1.04"; plugin->info->author = "LarsGit223"; /* Set functions */ Modified: workbench/src/wb_monitor.c 24 lines changed, 1 insertions(+), 23 deletions(-) =================================================================== @@ -31,7 +31,6 @@ #include "wb_monitor.h" #include "utils.h" -#ifdef __WB_LIVE_UPDATE struct S_WB_MONITOR { @@ -122,26 +121,6 @@ static void wb_monitor_file_changed_cb(G_GNUC_UNUSED GFileMonitor *monitor, entry->prj, entry->dir, file_path); break; - case G_FILE_MONITOR_EVENT_RENAMED: - event_string = "FILE_RENAMED"; - workbench_process_remove_file_event (wb_globals.opened_wb, - entry->prj, entry->dir, file_path); - workbench_process_add_file_event (wb_globals.opened_wb, - entry->prj, entry->dir, other_file_path); - break; - - case G_FILE_MONITOR_EVENT_MOVED_IN: - event_string = "FILE_MOVED_IN"; - workbench_process_add_file_event (wb_globals.opened_wb, - entry->prj, entry->dir, file_path); - break; - - case G_FILE_MONITOR_EVENT_MOVED_OUT: - event_string = "FILE_MOVED_OUT"; - workbench_process_remove_file_event (wb_globals.opened_wb, - entry->prj, entry->dir, file_path); - break; - default: break; } @@ -204,7 +183,7 @@ void wb_monitor_add_dir(WB_MONITOR *monitor, WB_PROJECT *prj, /* Setup file monitor for directory */ file = g_file_new_for_path(dirpath); newmon = g_file_monitor_directory - (file, G_FILE_MONITOR_WATCH_MOVES, NULL, &error); + (file, G_FILE_MONITOR_NONE, NULL, &error); if (newmon == NULL) { /* Create monitor failed. Report error. */ @@ -267,4 +246,3 @@ void wb_monitor_free(WB_MONITOR *monitor) } } } -#endif Modified: workbench/src/wb_monitor.h 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -22,18 +22,12 @@ #include <glib.h> #include "wb_project.h" -#if defined(HAVE_GIO) && GLIB_CHECK_VERSION (2, 46, 0) -#define __WB_LIVE_UPDATE 1 -#endif - typedef struct S_WB_MONITOR WB_MONITOR; -#ifdef __WB_LIVE_UPDATE WB_MONITOR *wb_monitor_new(void); void wb_monitor_add_dir(WB_MONITOR *monitor, WB_PROJECT *prj, WB_PROJECT_DIR *dir, const gchar *dirpath); gboolean wb_monitor_remove_dir(WB_MONITOR *monitor, const gchar *dirpath); void wb_monitor_free(WB_MONITOR *monitor); -#endif #endif Modified: workbench/src/wb_project.c 10 lines changed, 0 insertions(+), 10 deletions(-) =================================================================== @@ -569,7 +569,6 @@ static guint wb_project_dir_rescan_int(WB_PROJECT *prj, WB_PROJECT_DIR *root) /* Add a new file to the project directory and update the sidebar. */ -#ifdef __WB_LIVE_UPDATE static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) { gboolean matches; @@ -634,7 +633,6 @@ static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, c g_slist_free(scanned); } } -#endif /** Add a new file to the project directory and update the sidebar. @@ -646,19 +644,16 @@ static void wb_project_dir_add_file_int(WB_PROJECT *prj, WB_PROJECT_DIR *root, c * @param filepath The file to add. * **/ -#ifdef __WB_LIVE_UPDATE void wb_project_dir_add_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) { wb_project_dir_add_file_int(prj, root, filepath); wb_project_add_idle_action(WB_PROJECT_IDLE_ACTION_ID_UPDATE_TAGS, root, NULL); } -#endif /* Check if the filepath is equal for the length of the directory path in px_temp */ -#ifdef __WB_LIVE_UPDATE static gboolean wb_project_dir_remove_child (gpointer key, gpointer value, gpointer user_data) { WB_PROJECT_TEMP_DATA *px_temp; @@ -680,7 +675,6 @@ static gboolean wb_project_dir_remove_child (gpointer key, gpointer value, gpoin } return FALSE; } -#endif /** Remove a file from the project directory and update the sidebar. @@ -692,7 +686,6 @@ static gboolean wb_project_dir_remove_child (gpointer key, gpointer value, gpoin * @param filepath The file to remove. * **/ -#ifdef __WB_LIVE_UPDATE void wb_project_dir_remove_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gchar *filepath) { gboolean matches, was_dir; @@ -768,7 +761,6 @@ void wb_project_dir_remove_file(WB_PROJECT *prj, WB_PROJECT_DIR *root, const gch } } } -#endif /* Stolen and modified version from Geany. The only difference is that Geany @@ -932,7 +924,6 @@ void wb_project_rescan(WB_PROJECT *prj) } /* Create file monitors for directories. */ -#ifdef __WB_LIVE_UPDATE if (workbench_get_enable_live_update(wb_globals.opened_wb) == TRUE) { WB_MONITOR *monitor; @@ -962,7 +953,6 @@ void wb_project_rescan(WB_PROJECT *prj) } } } -#endif } Modified: workbench/src/workbench.c 14 lines changed, 0 insertions(+), 14 deletions(-) =================================================================== @@ -92,9 +92,7 @@ WORKBENCH *workbench_new(void) new_wb->enable_live_update = TRUE; new_wb->projects = g_ptr_array_new(); new_wb->bookmarks = g_ptr_array_new(); -#ifdef __WB_LIVE_UPDATE new_wb->monitor = wb_monitor_new(); -#endif return new_wb; } @@ -125,9 +123,7 @@ void workbench_free(WORKBENCH *wb) } } -#ifdef __WB_LIVE_UPDATE wb_monitor_free(wb->monitor); -#endif g_ptr_array_free (wb->projects, TRUE); g_free(wb); } @@ -923,7 +919,6 @@ static gboolean workbench_references_are_valid(WORKBENCH *wb, WB_PROJECT *prj, W * @param file The new file to add to project/directory * **/ -#ifdef __WB_LIVE_UPDATE void workbench_process_add_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT_DIR *dir, const gchar *file) { if (workbench_references_are_valid(wb, prj, dir) == FALSE) @@ -936,7 +931,6 @@ void workbench_process_add_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT wb_project_dir_add_file(prj, dir, file); } -#endif /** Process the remove file event. @@ -951,7 +945,6 @@ void workbench_process_add_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT * @param file The file to remove from project/directory * **/ -#ifdef __WB_LIVE_UPDATE void workbench_process_remove_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJECT_DIR *dir, const gchar *file) { if (workbench_references_are_valid(wb, prj, dir) == FALSE) @@ -964,11 +957,9 @@ void workbench_process_remove_file_event(WORKBENCH *wb, WB_PROJECT *prj, WB_PROJ wb_project_dir_remove_file(prj, dir, file); } -#endif /* Foreach callback function for creating file monitors. */ -#ifdef __WB_LIVE_UPDATE static void workbench_enable_live_update_foreach_cb(SIDEBAR_CONTEXT *context, gpointer userdata) { @@ -998,7 +989,6 @@ static void workbench_enable_live_update_foreach_cb(SIDEBAR_CONTEXT *context, g_free(abs_path); } -#endif /** Enable live update. @@ -1011,15 +1001,13 @@ static void workbench_enable_live_update_foreach_cb(SIDEBAR_CONTEXT *context, **/ void workbench_enable_live_update(WORKBENCH *wb) { -#ifdef __WB_LIVE_UPDATE if (wb != NULL) { sidebar_call_foreach(DATA_ID_DIRECTORY, workbench_enable_live_update_foreach_cb, wb->monitor); sidebar_call_foreach(DATA_ID_SUB_DIRECTORY, workbench_enable_live_update_foreach_cb, wb->monitor); } -#endif } @@ -1033,10 +1021,8 @@ void workbench_enable_live_update(WORKBENCH *wb) **/ void workbench_disable_live_update(WORKBENCH *wb) { -#ifdef __WB_LIVE_UPDATE if (wb != NULL) { wb_monitor_free(wb->monitor); } -#endif } -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0b8ae8: Merge pull request #720 from LarsGit223/tb-no-gio-check
by Frank Lanitz 10 Mar '18

10 Mar '18

Branch: refs/heads/master Author: Frank Lanitz <frank(a)frank.uvena.de> Committer: GitHub <noreply(a)github.com> Date: Sat, 10 Mar 2018 05:36:03 UTC Commit: 0b8ae813e8286e1a9b92cc7661b8587c976aa53c https://github.com/geany/geany-plugins/commit/0b8ae813e8286e1a9b92cc7661b85… Log Message: ----------- Merge pull request #720 from LarsGit223/tb-no-gio-check treebrowser: removed HAVE_GIO checks Modified Paths: -------------- build/treebrowser.m4 treebrowser/src/treebrowser.c Modified: build/treebrowser.m4 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -15,14 +15,8 @@ AC_DEFUN([GP_CHECK_TREEBROWSER], ]) fi - PKG_CHECK_MODULES([GIO], [gio-2.0], - [AC_DEFINE([HAVE_GIO], 1, [Whether we have GIO]) - have_gio=yes], - [have_gio=no]) - AM_CONDITIONAL(ENABLE_TREEBROWSER, test "x$enable_treebrowser" = "xyes") GP_COMMIT_PLUGIN_STATUS([TreeBrowser]) - GP_STATUS_FEATURE_ADD([TreeBrowser GIO support], [$have_gio]) AC_CONFIG_FILES([ treebrowser/Makefile Modified: treebrowser/src/treebrowser.c 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -19,9 +19,7 @@ #include "geany.h" #include "geanyplugin.h" -#ifdef HAVE_GIO -# include <gio/gio.h> -#endif +#include <gio/gio.h> #ifdef G_OS_WIN32 # include <windows.h> @@ -208,7 +206,7 @@ utils_pixbuf_from_stock(const gchar *stock_id) static GdkPixbuf * utils_pixbuf_from_path(gchar *path) { -#if defined(HAVE_GIO) && GTK_CHECK_VERSION(2, 14, 0) +#if GTK_CHECK_VERSION(2, 14, 0) GIcon *icon; GdkPixbuf *ret = NULL; GtkIconInfo *info; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] 0b49ba: treebrowser: removed HAVE_GIO checks
by LarsDW223 07 Mar '18

07 Mar '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Wed, 07 Mar 2018 20:24:21 UTC Commit: 0b49baec7d516b82fcac4c99d26fc9ea3073effd https://github.com/geany/geany-plugins/commit/0b49baec7d516b82fcac4c99d26fc… Log Message: ----------- treebrowser: removed HAVE_GIO checks Modified Paths: -------------- build/treebrowser.m4 treebrowser/src/treebrowser.c Modified: build/treebrowser.m4 6 lines changed, 0 insertions(+), 6 deletions(-) =================================================================== @@ -15,14 +15,8 @@ AC_DEFUN([GP_CHECK_TREEBROWSER], ]) fi - PKG_CHECK_MODULES([GIO], [gio-2.0], - [AC_DEFINE([HAVE_GIO], 1, [Whether we have GIO]) - have_gio=yes], - [have_gio=no]) - AM_CONDITIONAL(ENABLE_TREEBROWSER, test "x$enable_treebrowser" = "xyes") GP_COMMIT_PLUGIN_STATUS([TreeBrowser]) - GP_STATUS_FEATURE_ADD([TreeBrowser GIO support], [$have_gio]) AC_CONFIG_FILES([ treebrowser/Makefile Modified: treebrowser/src/treebrowser.c 6 lines changed, 2 insertions(+), 4 deletions(-) =================================================================== @@ -19,9 +19,7 @@ #include "geany.h" #include "geanyplugin.h" -#ifdef HAVE_GIO -# include <gio/gio.h> -#endif +#include <gio/gio.h> #ifdef G_OS_WIN32 # include <windows.h> @@ -208,7 +206,7 @@ utils_pixbuf_from_stock(const gchar *stock_id) static GdkPixbuf * utils_pixbuf_from_path(gchar *path) { -#if defined(HAVE_GIO) && GTK_CHECK_VERSION(2, 14, 0) +#if GTK_CHECK_VERSION(2, 14, 0) GIcon *icon; GdkPixbuf *ret = NULL; GtkIconInfo *info; -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

[geany/geany-plugins] e171c3: workbench: cleaned up 'workbench.m4'
by LarsDW223 07 Mar '18

07 Mar '18

Branch: refs/heads/master Author: LarsDW223 <lars_paulsen(a)web.de> Committer: LarsDW223 <lars_paulsen(a)web.de> Date: Wed, 07 Mar 2018 19:54:18 UTC Commit: e171c35d14539666f2ec878a57b3634fd877da80 https://github.com/geany/geany-plugins/commit/e171c35d14539666f2ec878a57b36… Log Message: ----------- workbench: cleaned up 'workbench.m4' Modified Paths: -------------- build/workbench.m4 Modified: build/workbench.m4 5 lines changed, 0 insertions(+), 5 deletions(-) =================================================================== @@ -3,11 +3,6 @@ AC_DEFUN([GP_CHECK_WORKBENCH], GP_ARG_DISABLE([Workbench], [auto]) GP_CHECK_UTILSLIB([Workbench]) - PKG_CHECK_MODULES([GIO], [gio-2.0], - [AC_DEFINE([HAVE_GIO], 1, [Whether we have GIO]) - have_gio=yes], - [have_gio=no]) - GP_COMMIT_PLUGIN_STATUS([Workbench]) AC_CONFIG_FILES([ workbench/Makefile -------------- This E-Mail was brought to you by github_commit_mail.py (Source: https://github.com/geany/infrastructure).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits March 2018