Plugins-Commits August 2012

plugins-commits@lists.geany.org

1 participants
62 discussions

[geany/geany-plugins] 43081f: commander: Fix the Geany API dependency
by Colomban Wendling 06 Aug '12

06 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 06 Aug 2012 16:17:39 Commit: 43081f06a9ee95d281bd54ab76b8767877eae5eb https://github.com/geany/geany-plugins/commit/43081f06a9ee95d281bd54ab76b87… Log Message: ----------- commander: Fix the Geany API dependency We need API 205 for plugin_idle_add(). Modified Paths: -------------- commander/src/commander-plugin.c Modified: commander/src/commander-plugin.c 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -32,7 +32,7 @@ GeanyData *geany_data; GeanyFunctions *geany_functions; -PLUGIN_VERSION_CHECK(195) +PLUGIN_VERSION_CHECK(205) PLUGIN_SET_TRANSLATABLE_INFO ( LOCALEDIR, GETTEXT_PACKAGE, @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 83b49b: Make sure to abort if any of the commands in autogen.sh fails
by Colomban Wendling 06 Aug '12

06 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Mon, 06 Aug 2012 14:09:05 Commit: 83b49b8b0a15da50772ddfadefb9a00fff66d611 https://github.com/geany/geany-plugins/commit/83b49b8b0a15da50772ddfadefb9a… Log Message: ----------- Make sure to abort if any of the commands in autogen.sh fails Modified Paths: -------------- autogen.sh Modified: autogen.sh 2 files changed, 1 insertions(+), 1 deletions(-) =================================================================== @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/sh -e mkdir -p build/cache intltoolize -c -f @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] cea3d2: GeanyLaTeX: Fix documentation installation path
by Chow Loong Jin 05 Aug '12

05 Aug '12

Branch: refs/heads/master Author: Chow Loong Jin <hyperair(a)debian.org> Committer: Chow Loong Jin <hyperair(a)debian.org> Date: Sun, 05 Aug 2012 16:13:41 Commit: cea3d2190b1eacf15309377787d8f3123cef1a91 https://github.com/geany/geany-plugins/commit/cea3d2190b1eacf15309377787d8f… Log Message: ----------- GeanyLaTeX: Fix documentation installation path $(plugin) was not defined, and as a result, $(plugindocdir) was set to $(pkgdocdir), i.e. /usr/share/doc/geany-plugins. As a result, all of geanylatex's documentation was installed to the global documentation directory (/usr/share/doc/geany-plugins) rather than the per-plugin documentation directory (/usr/share/doc/geany-plugins/geanylatex) Modified Paths: -------------- geanylatex/doc/Makefile.am Modified: geanylatex/doc/Makefile.am 1 files changed, 1 insertions(+), 0 deletions(-) =================================================================== @@ -1,5 +1,6 @@ include $(top_srcdir)/build/vars.docs.mk +plugin = geanylatex dist_plugindoc_DATA = \ geanylatex2.html \ geanylatex3.html \ @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] b972c5: commander: Respond to the entry's ::activate signal
by Colomban Wendling 04 Aug '12

04 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 04 Aug 2012 16:18:51 Commit: b972c5e09aafc26f7d0c76187243a098204d23b0 https://github.com/geany/geany-plugins/commit/b972c5e09aafc26f7d0c76187243a… Log Message: ----------- commander: Respond to the entry's ::activate signal Although we should never get this signal since we catch Enter/Return key presses anyway, handling the signal makes sure we respond to activation, whatever triggered it. Modified Paths: -------------- commander/src/commander-plugin.c Modified: commander/src/commander-plugin.c 9 files changed, 9 insertions(+), 0 deletions(-) =================================================================== @@ -489,6 +489,13 @@ enum { } static void +on_entry_activate (GtkEntry *entry, + gpointer dummy) +{ + tree_view_activate_focused_row (GTK_TREE_VIEW (plugin_data.view)); +} + +static void on_panel_hide (GtkWidget *widget, gpointer dummy) { @@ -610,6 +617,8 @@ enum { plugin_data.entry = gtk_entry_new (); g_signal_connect (plugin_data.entry, "notify::text", G_CALLBACK (on_entry_text_notify), NULL); + g_signal_connect (plugin_data.entry, "activate", + G_CALLBACK (on_entry_activate), NULL); gtk_box_pack_start (GTK_BOX (box), plugin_data.entry, FALSE, TRUE, 0); plugin_data.store = gtk_list_store_new (COL_COUNT, @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 5107e6: commander: Use tree view cursor, not selection
by Colomban Wendling 04 Aug '12

04 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 04 Aug 2012 16:07:21 Commit: 5107e66d9a1f1c9ea8cb3e7514908d52c089ae5c https://github.com/geany/geany-plugins/commit/5107e66d9a1f1c9ea8cb3e7514908… Log Message: ----------- commander: Use tree view cursor, not selection A tree view has a cursor, which is what we actually want to move or activate, rather than the selection. The cursor is displayed through the selection, so it doesn't change anything visually. Modified Paths: -------------- commander/src/commander-plugin.c Modified: commander/src/commander-plugin.c 75 files changed, 37 insertions(+), 38 deletions(-) =================================================================== @@ -175,14 +175,13 @@ enum { } static void -tree_view_set_active_cell (GtkTreeView *view, - GtkTreeIter *iter) +tree_view_set_cursor_from_iter (GtkTreeView *view, + GtkTreeIter *iter) { GtkTreePath *path; path = gtk_tree_model_get_path (gtk_tree_view_get_model (view), iter); - gtk_tree_selection_select_iter (gtk_tree_view_get_selection (view), iter); - gtk_tree_view_scroll_to_cell (view, path, NULL, FALSE, 0.0, 0.0); + gtk_tree_view_set_cursor (view, path, NULL, FALSE); gtk_tree_path_free (path); } @@ -191,12 +190,13 @@ enum { GtkMovementStep step, gint amount) { - GtkTreeIter iter; - GtkTreeSelection *selection = gtk_tree_view_get_selection (view); - GtkTreeModel *model = gtk_tree_view_get_model (view); - gboolean valid = FALSE; + GtkTreeIter iter; + GtkTreePath *path; + GtkTreeModel *model = gtk_tree_view_get_model (view); + gboolean valid = FALSE; - if (! gtk_tree_selection_get_selected (selection, NULL, &iter)) { + gtk_tree_view_get_cursor (view, &path, NULL); + if (! path) { valid = gtk_tree_model_get_iter_first (model, &iter); } else { switch (step) { @@ -215,36 +215,48 @@ enum { case GTK_MOVEMENT_PAGES: /* FIXME: move by page */ case GTK_MOVEMENT_DISPLAY_LINES: + gtk_tree_model_get_iter (model, &iter, path); if (amount > 0) { while ((valid = gtk_tree_model_iter_next (model, &iter)) && --amount > 0) ; } else if (amount < 0) { - GtkTreePath *path = gtk_tree_model_get_path (model, &iter); - while ((valid = gtk_tree_path_prev (path)) && --amount > 0) ; if (valid) { gtk_tree_model_get_iter (model, &iter, path); } - gtk_tree_path_free (path); } break; default: g_assert_not_reached (); } + gtk_tree_path_free (path); } if (valid) { - tree_view_set_active_cell (view, &iter); + tree_view_set_cursor_from_iter (view, &iter); } else { gtk_widget_error_bell (GTK_WIDGET (view)); } } static void +tree_view_activate_focused_row (GtkTreeView *view) +{ + GtkTreePath *path; + GtkTreeViewColumn *column; + + gtk_tree_view_get_cursor (view, &path, &column); + if (path) { + gtk_tree_view_row_activated (view, path, column); + gtk_tree_path_free (path); + } +} + +static void store_populate_menu_items (GtkListStore *store, GtkMenuShell *menu, const gchar *parent_path) @@ -431,20 +443,9 @@ enum { case GDK_KEY_Return: case GDK_KEY_KP_Enter: - case GDK_KEY_ISO_Enter: { - GtkTreeIter iter; - GtkTreeView *view = GTK_TREE_VIEW (plugin_data.view); - GtkTreeSelection *selection = gtk_tree_view_get_selection (view); - GtkTreeModel *model; - - if (gtk_tree_selection_get_selected (selection, &model, &iter)) { - GtkTreePath *path = gtk_tree_model_get_path (model, &iter); - gtk_tree_view_row_activated (view, path, NULL); - gtk_tree_path_free (path); - } - + case GDK_KEY_ISO_Enter: + tree_view_activate_focused_row (GTK_TREE_VIEW (plugin_data.view)); return TRUE; - } case GDK_KEY_Page_Up: case GDK_KEY_Page_Down: @@ -483,7 +484,7 @@ enum { sort_func, NULL, NULL); if (gtk_tree_model_get_iter_first (model, &iter)) { - tree_view_set_active_cell (view, &iter); + tree_view_set_cursor_from_iter (view, &iter); } } @@ -492,17 +493,12 @@ enum { gpointer dummy) { GtkTreeView *view = GTK_TREE_VIEW (plugin_data.view); - GtkTreeModel *model; - GtkTreeIter iter; if (plugin_data.last_path) { gtk_tree_path_free (plugin_data.last_path); plugin_data.last_path = NULL; } - if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (view), - &model, &iter)) { - plugin_data.last_path = gtk_tree_model_get_path (model, &iter); - } + gtk_tree_view_get_cursor (view, &plugin_data.last_path, NULL); gtk_list_store_clear (plugin_data.store); } @@ -511,6 +507,7 @@ enum { on_panel_show (GtkWidget *widget, gpointer dummy) { + GtkTreePath *path; GtkTreeView *view = GTK_TREE_VIEW (plugin_data.view); fill_store (plugin_data.store); @@ -518,17 +515,19 @@ enum { gtk_widget_grab_focus (plugin_data.entry); if (plugin_data.last_path) { - gtk_tree_selection_select_path (gtk_tree_view_get_selection (view), - plugin_data.last_path); + gtk_tree_view_set_cursor (view, plugin_data.last_path, NULL, FALSE); gtk_tree_view_scroll_to_cell (view, plugin_data.last_path, NULL, TRUE, 0.5, 0.5); } - if (! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (view), - NULL, NULL)) { + /* make sure the cursor is set (e.g. if plugin_data.last_path wasn't valid) */ + gtk_tree_view_get_cursor (view, &path, NULL); + if (path) { + gtk_tree_path_free (path); + } else { GtkTreeIter iter; if (gtk_tree_model_get_iter_first (gtk_tree_view_get_model (view), &iter)) { - tree_view_set_active_cell (GTK_TREE_VIEW (plugin_data.view), &iter); + tree_view_set_cursor_from_iter (GTK_TREE_VIEW (plugin_data.view), &iter); } } } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] 11ec50: commander: Depend on GTK 2.16 only and check for that version
by Colomban Wendling 04 Aug '12

04 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 04 Aug 2012 15:37:40 Commit: 11ec506bd772ef871a93dd6701c815d377846c7d https://github.com/geany/geany-plugins/commit/11ec506bd772ef871a93dd6701c81… Log Message: ----------- commander: Depend on GTK 2.16 only and check for that version Modified Paths: -------------- build/commander.m4 commander/src/commander-plugin.c Modified: build/commander.m4 4 files changed, 2 insertions(+), 2 deletions(-) =================================================================== @@ -3,8 +3,8 @@ AC_DEFUN([GP_CHECK_COMMANDER], GP_ARG_DISABLE([Commander], [auto]) GP_CHECK_PLUGIN_DEPS([Commander], [COMMANDER], - [gtk+-2.0 >= 2.0 - glib-2.0 >= 2.0]) + [gtk+-2.0 >= 2.16 + glib-2.0 >= 2.4]) GP_STATUS_PLUGIN_ADD([Commander], [$enable_commander]) Modified: commander/src/commander-plugin.c 24 files changed, 24 insertions(+), 0 deletions(-) =================================================================== @@ -43,6 +43,30 @@ ) +/* GTK compatibility functions/macros */ + +#if ! GTK_CHECK_VERSION (2, 18, 0) +# define gtk_widget_get_visible(w) \ + (GTK_WIDGET_VISIBLE (w)) +# define gtk_widget_set_can_focus(w) \ + (GTK_WIDGET_SET_FLAGS ((w), GTK_CAN_FOCUS)) +#endif + +#if ! GTK_CHECK_VERSION (2, 21, 8) +# define GDK_KEY_Down GDK_Down +# define GDK_KEY_Escape GDK_Escape +# define GDK_KEY_ISO_Enter GDK_ISO_Enter +# define GDK_KEY_KP_Enter GDK_KP_Enter +# define GDK_KEY_Page_Down GDK_Page_Down +# define GDK_KEY_Page_Up GDK_Page_Up +# define GDK_KEY_Return GDK_Return +# define GDK_KEY_Tab GDK_Tab +# define GDK_KEY_Up GDK_Up +#endif + + +/* Plugin */ + enum { KB_SHOW_PANEL, KB_COUNT @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] f0fc46: commander: Fix sorting when using a type prefix
by Colomban Wendling 04 Aug '12

04 Aug '12

1 0

[geany/geany-plugins] ec2433: commander: Respond on tree view row activation
by Colomban Wendling 04 Aug '12

04 Aug '12

1 0

[geany/geany-plugins] 9ff016: commander: Create list on show and empty it on hide
by Colomban Wendling 04 Aug '12

04 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 04 Aug 2012 15:08:40 Commit: 9ff0160f3fb6676886c9c925c02a568d0c4b6bbf https://github.com/geany/geany-plugins/commit/9ff0160f3fb6676886c9c925c02a5… Log Message: ----------- commander: Create list on show and empty it on hide This makes sure the list is always shown for the real current status (e.g. if menu changed) and avoid wasting some memory when the window is hidden. This requires to rebuild the list each time, but it's not that slow anyway. Modified Paths: -------------- commander/src/commander-plugin.c Modified: commander/src/commander-plugin.c 105 files changed, 61 insertions(+), 44 deletions(-) =================================================================== @@ -58,9 +58,12 @@ struct { GtkListStore *store; GtkTreeModel *filter; GtkTreeModel *sort; + + GtkTreePath *last_path; } plugin_data = { NULL, NULL, NULL, - NULL, NULL, NULL + NULL, NULL, NULL, + NULL }; typedef enum { @@ -471,36 +474,14 @@ enum { static void fill_store (GtkListStore *store) { - GtkWidget *menubar; + GtkWidget *menubar; + guint i; + /* menu items */ menubar = find_menubar (GTK_CONTAINER (geany_data->main_widgets->window)); store_populate_menu_items (store, GTK_MENU_SHELL (menubar), NULL); -} - -/* we reset all file items not to have to monitor the open/close/renames/etc */ -static void -reset_file_items (GtkListStore *store) -{ - GtkTreeIter iter; - guint i; - - /* remove old items */ - if (gtk_tree_model_get_iter_first (GTK_TREE_MODEL (store), &iter)) { - gboolean has_next = TRUE; - - while (has_next) { - gint type; - - gtk_tree_model_get (GTK_TREE_MODEL (store), &iter, COL_TYPE, &type, -1); - if (type == COL_TYPE_FILE) { - has_next = gtk_list_store_remove (store, &iter); - } else { - has_next = gtk_tree_model_iter_next (GTK_TREE_MODEL (store), &iter); - } - } - } - /* and add new ones */ + /* open files */ foreach_document (i) { gchar *basename = g_path_get_basename (DOC_FILENAME (documents[i])); gchar *label = g_markup_printf_escaped ("<big>%s</big>\n" @@ -520,6 +501,52 @@ enum { } static void +on_panel_hide (GtkWidget *widget, + gpointer dummy) +{ + GtkTreeView *view = GTK_TREE_VIEW (plugin_data.view); + GtkTreeModel *model; + GtkTreeIter iter; + + if (plugin_data.last_path) { + gtk_tree_path_free (plugin_data.last_path); + plugin_data.last_path = NULL; + } + if (gtk_tree_selection_get_selected (gtk_tree_view_get_selection (view), + &model, &iter)) { + plugin_data.last_path = gtk_tree_model_get_path (model, &iter); + } + + gtk_list_store_clear (plugin_data.store); +} + +static void +on_panel_show (GtkWidget *widget, + gpointer dummy) +{ + GtkTreeView *view = GTK_TREE_VIEW (plugin_data.view); + + fill_store (plugin_data.store); + + gtk_widget_grab_focus (plugin_data.entry); + + if (plugin_data.last_path) { + gtk_tree_selection_select_path (gtk_tree_view_get_selection (view), + plugin_data.last_path); + gtk_tree_view_scroll_to_cell (view, plugin_data.last_path, NULL, + TRUE, 0.5, 0.5); + } + if (! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (view), + NULL, NULL)) { + GtkTreeIter iter; + + if (gtk_tree_model_get_iter_first (plugin_data.sort, &iter)) { + tree_view_set_active_cell (GTK_TREE_VIEW (plugin_data.view), &iter); + } + } +} + +static void on_view_row_activated (GtkTreeView *view, GtkTreePath *path, GtkTreeViewColumn *column, @@ -580,6 +607,10 @@ enum { NULL); g_signal_connect (plugin_data.panel, "focus-out-event", G_CALLBACK (gtk_widget_hide), NULL); + g_signal_connect (plugin_data.panel, "show", + G_CALLBACK (on_panel_show), NULL); + g_signal_connect (plugin_data.panel, "hide", + G_CALLBACK (on_panel_hide), NULL); g_signal_connect (plugin_data.panel, "key-press-event", G_CALLBACK (on_panel_key_press_event), NULL); @@ -601,7 +632,6 @@ enum { G_TYPE_INT, GTK_TYPE_WIDGET, G_TYPE_POINTER); - fill_store (plugin_data.store); plugin_data.filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (plugin_data.store), NULL); @@ -633,29 +663,13 @@ enum { G_CALLBACK (on_view_row_activated), NULL); gtk_container_add (GTK_CONTAINER (scroll), plugin_data.view); - on_entry_text_notify (G_OBJECT (plugin_data.entry), NULL, NULL); - gtk_widget_show_all (frame); } static void on_kb_show_panel (guint key_id) { - GtkTreeView *view = GTK_TREE_VIEW (plugin_data.view); - - reset_file_items (plugin_data.store); - gtk_widget_show (plugin_data.panel); - gtk_widget_grab_focus (plugin_data.entry); - - if (! gtk_tree_selection_get_selected (gtk_tree_view_get_selection (view), - NULL, NULL)) { - GtkTreeIter iter; - - if (gtk_tree_model_get_iter_first (plugin_data.sort, &iter)) { - tree_view_set_active_cell (GTK_TREE_VIEW (plugin_data.view), &iter); - } - } } static gboolean @@ -686,4 +700,7 @@ enum { if (plugin_data.panel) { gtk_widget_destroy (plugin_data.panel); } + if (plugin_data.last_path) { + gtk_tree_path_free (plugin_data.last_path); + } } @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

[geany/geany-plugins] c9bf80: commander: Drop filtering an fix resorting
by Colomban Wendling 04 Aug '12

04 Aug '12

Branch: refs/heads/master Author: Colomban Wendling <ban(a)herbesfolles.org> Committer: Colomban Wendling <ban(a)herbesfolles.org> Date: Sat, 04 Aug 2012 15:08:40 Commit: c9bf807fca29ab418b39743c624cd49bfed22c34 https://github.com/geany/geany-plugins/commit/c9bf807fca29ab418b39743c624cd… Log Message: ----------- commander: Drop filtering an fix resorting Modified Paths: -------------- commander/src/commander-plugin.c Modified: commander/src/commander-plugin.c 83 files changed, 17 insertions(+), 66 deletions(-) =================================================================== @@ -56,13 +56,12 @@ struct { GtkWidget *entry; GtkWidget *view; GtkListStore *store; - GtkTreeModel *filter; GtkTreeModel *sort; GtkTreePath *last_path; } plugin_data = { NULL, NULL, NULL, - NULL, NULL, NULL, + NULL, NULL, NULL }; @@ -82,36 +81,6 @@ enum { }; -static gboolean -key_matches (const gchar *key_, - const gchar *text_) -{ - gchar *text; - gchar *key; - gchar *text_p; - gchar *key_p; - gboolean result; - - text_p = text = g_utf8_casefold (text_, -1); - key_p = key = g_utf8_casefold (key_, -1); - - while (*key_p && *text_p) { - if (*text_p == *key_p) { - text_p ++; - key_p ++; - } else { - text_p ++; - } - } - - result = *key_p == 0; - - g_free (text); - g_free (key); - - return result; -} - /* TODO: improve this algorithm for better matches. * what's needed is probably not to simply eat a letter when it matches, but * rather give it a chance to provide an heavier match... whatever, be smart. */ @@ -209,26 +178,6 @@ enum { return dista - distb; } -static gboolean -filter_visible_func (GtkTreeModel *model, - GtkTreeIter *iter, - gpointer dummy) -{ - gboolean visible = FALSE; - gchar *text; - gint type; - gint key_type; - const gchar *key = get_key (&key_type); - - gtk_tree_model_get (model, iter, COL_PATH, &text, COL_TYPE, &type, -1); - if (type & key_type) { - visible = key_matches (key, text); - } - g_free (text); - - return visible; -} - static void tree_view_set_active_cell (GtkTreeView *view, GtkTreeIter *iter) @@ -354,12 +303,20 @@ enum { GParamSpec *pspec, gpointer dummy) { - GtkTreeIter iter; + GtkTreeIter iter; + GtkTreeView *view = GTK_TREE_VIEW (plugin_data.view); + GtkTreeModel *model = gtk_tree_view_get_model (view); - gtk_tree_model_filter_refilter (GTK_TREE_MODEL_FILTER (plugin_data.filter)); + /* we force re-sorting the whole model from how it was before, and the + * back to the new filter. this is somewhat hackish but since we don't + * know the original sorting order, and GtkTreeSortable don't have a + * resort() API anyway. */ + gtk_tree_model_sort_reset_default_sort_func (GTK_TREE_MODEL_SORT (model)); + gtk_tree_sortable_set_default_sort_func (GTK_TREE_SORTABLE (model), + sort_func, NULL, NULL); - if (gtk_tree_model_get_iter_first (plugin_data.sort, &iter)) { - tree_view_set_active_cell (GTK_TREE_VIEW (plugin_data.view), &iter); + if (gtk_tree_model_get_iter_first (model, &iter)) { + tree_view_set_active_cell (view, &iter); } } @@ -540,7 +497,7 @@ enum { NULL, NULL)) { GtkTreeIter iter; - if (gtk_tree_model_get_iter_first (plugin_data.sort, &iter)) { + if (gtk_tree_model_get_iter_first (gtk_tree_view_get_model (view), &iter)) { tree_view_set_active_cell (GTK_TREE_VIEW (plugin_data.view), &iter); } } @@ -633,16 +590,10 @@ enum { GTK_TYPE_WIDGET, G_TYPE_POINTER); - plugin_data.filter = gtk_tree_model_filter_new (GTK_TREE_MODEL (plugin_data.store), - NULL); - gtk_tree_model_filter_set_visible_func (GTK_TREE_MODEL_FILTER (plugin_data.filter), - filter_visible_func, NULL, NULL); - - plugin_data.sort = gtk_tree_model_sort_new_with_model (plugin_data.filter); - gtk_tree_sortable_set_sort_func (GTK_TREE_SORTABLE (plugin_data.sort), - COL_PATH, sort_func, NULL, NULL); + plugin_data.sort = gtk_tree_model_sort_new_with_model (GTK_TREE_MODEL (plugin_data.store)); gtk_tree_sortable_set_sort_column_id (GTK_TREE_SORTABLE (plugin_data.sort), - COL_PATH, GTK_SORT_ASCENDING); + GTK_TREE_SORTABLE_DEFAULT_SORT_COLUMN_ID, + GTK_SORT_ASCENDING); scroll = g_object_new (GTK_TYPE_SCROLLED_WINDOW, "hscrollbar-policy", GTK_POLICY_AUTOMATIC, @@ Diff output truncated at 100000 characters. @@ -------------- This E-Mail was brought to you by github_commit_mail.py (Source: TBD).

1 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

Plugins-Commits August 2012