From 07053d49a019b1d6446fe384140bbef29776e536 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Andr=C3=A9=20St=C3=B6sel?= Date: Wed, 30 Jun 2010 22:27:52 +0200 Subject: [PATCH] Re-implement History List extension in Vala --- extensions/history-list.vala | 255 +++++++++++++++++++++ extensions/tab-switcher.c | 423 ----------------------------------- 2 files changed, 255 insertions(+), 423 deletions(-) create mode 100644 extensions/history-list.vala delete mode 100644 extensions/tab-switcher.c diff --git a/extensions/history-list.vala b/extensions/history-list.vala new file mode 100644 index 00000000..b111a9f4 --- /dev/null +++ b/extensions/history-list.vala @@ -0,0 +1,255 @@ +/* + Copyright (C) 2010 André Stösel + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + See the file COPYING for the full license text. +*/ + +using Gtk; +using Gdk; +using WebKit; +using Midori; + +enum TabTreeCells { + TREE_CELL_PIXBUF, + TREE_CELL_STRING, + TREE_CELL_POINTER, + TREE_CELL_COUNT +} + +private abstract class HistoryWindow : Gtk.Window { + public Midori.Browser browser { get; construct set; } + protected Gtk.TreeView? treeview = null; + public HistoryWindow (Midori.Browser browser) { + GLib.Object (type: Gtk.WindowType.POPUP, + window_position: Gtk.WindowPosition.CENTER, + browser: browser); + } + public void walk (int step) { + Gtk.TreePath? path; + Gtk.TreeViewColumn? column; + + this.treeview.get_cursor (out path, out column); + + unowned int[] indices = path.get_indices (); + int new_index = indices[0] + step; + + var model = this.treeview.get_model () as Gtk.ListStore; + + while (new_index < 0 || new_index >= model.length) + new_index = new_index < 0 ? model.length + new_index : new_index - model.length; + + path = new Gtk.TreePath.from_indices (new_index); + this.treeview.set_cursor (path, column, false); + } + public abstract void make_update (); +} + +private class TabWindow : HistoryWindow { + public TabWindow (Midori.Browser browser) { + base (browser); + + var hbox = new Gtk.HBox (false, 1); + this.add (hbox); + + var sw = new Gtk.ScrolledWindow (null, null); + sw.set_size_request (320, 20); + sw.set_policy (PolicyType.NEVER , PolicyType.AUTOMATIC); + sw.set_shadow_type (ShadowType.ETCHED_IN); + hbox.pack_start (sw, true, true, 0); + + var store = new Gtk.ListStore (TabTreeCells.TREE_CELL_COUNT, + typeof (Gdk.Pixbuf), typeof (string), typeof (void*)); + + Gtk.TreeIter iter; + unowned GLib.PtrArray list = this.browser.get_data ("history-list-tab-history"); + for (var i = list.len; i > 0; i--) { + Midori.View view = list.index (i - 1) as Midori.View; + + Gdk.Pixbuf? icon = null; + view.get ("icon", ref icon); + + unowned string title = view.get_display_title (); + + store.append (out iter); + store.set (iter, TabTreeCells.TREE_CELL_PIXBUF, icon, + TabTreeCells.TREE_CELL_STRING, title, + TabTreeCells.TREE_CELL_POINTER, view); + } + + this.set_default_size (320, list.len > 10 ? 232 : (int) list.len * 23 + 2); + this.treeview = new Gtk.TreeView.with_model (store); + this.treeview.set_fixed_height_mode (true); + sw.add (treeview); + + this.treeview.set_model (store); + this.treeview.set ("headers-visible", false); + + this.treeview.insert_column_with_attributes ( + TabTreeCells.TREE_CELL_PIXBUF, "Icon", + new CellRendererPixbuf (), "pixbuf", 0); + this.treeview.insert_column_with_attributes ( + TabTreeCells.TREE_CELL_STRING, "Title", + new CellRendererText (), "text", 1); + + this.show_all (); + } + public override void make_update () { + Gtk.TreePath? path; + Gtk.TreeViewColumn? column; + + this.treeview.get_cursor (out path, out column); + + var model = this.treeview.get_model () as Gtk.ListStore; + + Gtk.TreeIter iter; + unowned Midori.View? view = null; + + model.get_iter (out iter, path); + model.get (iter, TabTreeCells.TREE_CELL_POINTER, out view); + this.browser.set ("tab", view); + } +} + +private class HistoryList : Midori.Extension { + protected uint modifier_count; + protected HistoryWindow? history_window; + protected ulong[] tmp_sig_ids = new ulong[2]; + public bool key_press (Gdk.EventKey event_key) { + if (event_key.is_modifier > 0) { + this.modifier_count++; + } + return false; + } + public bool key_release (Gdk.EventKey event_key, Browser browser) { + if (event_key.is_modifier > 0) { + this.modifier_count--; + if (this.modifier_count == 0) { + browser.disconnect (this.tmp_sig_ids[0]); + browser.disconnect (this.tmp_sig_ids[1]); + this.history_window.make_update (); + this.history_window.destroy (); + this.history_window = null; + } + } + return false; + } + public void walk (Gtk.Action action, Browser browser, Type type, int step) { + if (this.history_window == null || this.history_window.get_type () != type) { + if (this.history_window == null) { + this.modifier_count = Midori.Sokoke.gtk_action_count_modifiers (action); + this.tmp_sig_ids[0] = browser.key_press_event.connect ((ek) => { + return this.key_press (ek); + }); + this.tmp_sig_ids[1] = browser.key_release_event.connect ((ek) => { + return this.key_release (ek, browser); + }); + } else { + this.history_window.destroy (); + this.history_window = null; + } + /* + Bug: https://bugzilla.gnome.org/show_bug.cgi?id=618750 + Code: this.history_window = (Gtk.Window) GLib.Object.new (type); + */ + if (type == typeof (TabWindow)) { + this.history_window = new TabWindow (browser); + } + } + var hw = this.history_window as HistoryWindow; + hw.walk (step); + } + void browser_added (Midori.Browser browser) { + var acg = new Gtk.AccelGroup (); + browser.add_accel_group (acg); + var action_group = browser.get_action_group (); + + Gtk.Action action; + + action = new Gtk.Action ("HistoryListNextTab", + "Next Tab (HistoryList)", "Next tab from history", null); + action.activate.connect ((a) => { + this.walk (a, browser, typeof (TabWindow), 1); + }); + action_group.add_action_with_accel (action, "Tab"); + action.set_accel_group (acg); + action.connect_accelerator (); + + action = new Gtk.Action ("HistoryListPreviousTab", + "Previous Tab (HistoryList)", "Previous tab from history", null); + action.activate.connect ((a) => { + this.walk (a, browser, typeof (TabWindow), -1); + }); + action_group.add_action_with_accel (action, "Tab"); + action.set_accel_group (acg); + action.connect_accelerator (); + + browser.set_data ("history-list-tab-history", + new GLib.PtrArray ()); + foreach (var tab in browser.get_tabs ()) + tab_added (browser, tab); + browser.add_tab.connect (tab_added); + browser.remove_tab.connect (tab_removed); + browser.notify["tab"].connect (this.tab_changed); + } + void browser_removed (Midori.Browser browser) { + string[] callbacks = { "HistoryListNextTab", "HistoryListPreviousTab" }; + + Gtk.ActionGroup action_group; + action_group = browser.get_action_group (); + for (int i = 0; i < callbacks.length; i++) { + Gtk.Action action = action_group.get_action (callbacks[i]); + if (action != null) + action_group.remove_action (action); + } + + browser.add_tab.disconnect (tab_added); + browser.remove_tab.disconnect (tab_removed); + browser.notify["tab"].disconnect (this.tab_changed); + } + void tab_added (Midori.Browser browser, Midori.View view) { + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + list.add (view); + } + void tab_removed (Midori.Browser browser, Midori.View view) { + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + list.remove (view); + } + void tab_changed (GLib.Object window, GLib.ParamSpec pspec) { + Midori.Browser browser = window as Midori.Browser; + Midori.View view = null; + browser.get ("tab", ref view); + + unowned GLib.PtrArray list = browser.get_data ("history-list-tab-history"); + list.remove (view); + list.add (view); + } + void activated (Midori.App app) { + foreach (var browser in app.get_browsers ()) + browser_added (browser); + app.add_browser.connect (browser_added); + } + void deactivated () { + var app = get_app (); + foreach (var browser in app.get_browsers ()) + browser_removed (browser); + app.add_browser.disconnect (browser_added); + } + internal HistoryList () { + GLib.Object (name: "History List", + description: "Allows to switch tabs by choosing from a list sorted by last usage", + version: "0.2", + authors: "André Stösel "); + activate.connect (activated); + deactivate.connect (deactivated); + } +} + +public Midori.Extension extension_init () { + return new HistoryList (); +} + diff --git a/extensions/tab-switcher.c b/extensions/tab-switcher.c deleted file mode 100644 index ad778725..00000000 --- a/extensions/tab-switcher.c +++ /dev/null @@ -1,423 +0,0 @@ -/* - Copyright (C) 2009 André Stösel - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - See the file COPYING for the full license text. -*/ - -#include - -enum { TAB_ICON, TAB_NAME, TAB_POINTER, TAB_CELL_COUNT }; - -static MidoriExtension *thisExtension; -static gboolean switchEvent; - -static GdkPixbuf* tab_selector_get_snapshot(MidoriView* view, - gint maxwidth, - gint maxheight) -{ - GtkWidget* web_view; - guint width, height; - gfloat factor; - - g_return_val_if_fail (MIDORI_IS_VIEW (view), NULL); - - web_view = midori_view_get_web_view (view); - - if(maxwidth < 0) { - maxwidth *= -1; - } - if(maxheight < 0) { - maxheight *= -1; - } - - factor = MIN((gfloat) maxwidth / web_view->allocation.width, (gfloat) maxheight / web_view->allocation.height); - width = (int)(factor * web_view->allocation.width); - height = (int)(factor * web_view->allocation.height); - - return midori_view_get_snapshot(view, width, height); -} - -static void tab_selector_list_foreach (GtkWidget *view, - GtkListStore *store) -{ - GtkTreeIter it; - GdkPixbuf* icon = midori_view_get_icon (MIDORI_VIEW (view)); - const gchar *title = midori_view_get_display_title (MIDORI_VIEW (view)); - gtk_list_store_append (store, &it); - gtk_list_store_set (store, &it, TAB_ICON, icon, -1); - gtk_list_store_set (store, &it, TAB_NAME, title, -1); - gtk_list_store_set (store, &it, TAB_POINTER, view, -1); -} - -static GtkWidget* tab_selector_init_window (MidoriBrowser *browser) -{ - GList *list; - gint col_offset; - GtkCellRenderer *renderer; - GtkTreeViewColumn *column; - GtkWidget *window, *treeview, *sw, *hbox; - GtkListStore *store; - GtkWidget *page; - GtkWidget *image; - GdkPixbuf *snapshot; - - window = gtk_window_new(GTK_WINDOW_POPUP); - gtk_window_set_default_size(GTK_WINDOW(window), 320, 20); - gtk_window_set_position(GTK_WINDOW(window), GTK_WIN_POS_CENTER); - - - hbox = gtk_hbox_new(FALSE, 1); - gtk_container_add(GTK_CONTAINER(window), hbox); - gtk_container_set_border_width(GTK_CONTAINER(hbox), 1); - - sw = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (sw), - GTK_SHADOW_ETCHED_IN); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (sw), - GTK_POLICY_NEVER, - GTK_POLICY_AUTOMATIC); - - gtk_box_pack_start (GTK_BOX (hbox), sw, TRUE, TRUE, 0); - - store = gtk_list_store_new(TAB_CELL_COUNT, GDK_TYPE_PIXBUF, G_TYPE_STRING, G_TYPE_POINTER); - treeview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); - g_object_set_data(G_OBJECT(window), "tab_selector_treeview", treeview); - - list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - g_list_foreach(list, (GFunc) tab_selector_list_foreach, store); - - g_object_unref(store); - g_object_set(treeview, "headers-visible", FALSE, NULL); - - renderer = gtk_cell_renderer_pixbuf_new(); - - gtk_tree_view_insert_column_with_attributes( - GTK_TREE_VIEW(treeview), -1, "Icon", renderer, "pixbuf", TAB_ICON, NULL); - - renderer = gtk_cell_renderer_text_new(); - - col_offset = gtk_tree_view_insert_column_with_attributes( - GTK_TREE_VIEW(treeview), -1, "Title", renderer, "text", TAB_NAME, NULL); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), col_offset - 1); - gtk_tree_view_column_set_sizing (GTK_TREE_VIEW_COLUMN (column), - GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_fixed_width (GTK_TREE_VIEW_COLUMN (column), - midori_extension_get_integer(thisExtension, "TitleColumnWidth")); - - gtk_container_add (GTK_CONTAINER (sw), treeview); - - page = katze_object_get_object(browser, "tab"); - snapshot = tab_selector_get_snapshot(MIDORI_VIEW(page), - midori_extension_get_integer(thisExtension, "TabPreviewWidth"), - midori_extension_get_integer(thisExtension, "TabPreviewHeight")); - image = gtk_image_new_from_pixbuf (snapshot); - gtk_box_pack_start (GTK_BOX (hbox), image, TRUE, TRUE, 0); - g_object_set_data(G_OBJECT(window), "tab_selector_image", image); - - gtk_widget_show_all(window); - - return window; -} - -static void tab_selector_window_walk ( GtkWidget *window, - GdkEventKey *event, - MidoriBrowser *browser) -{ - gint *pindex, iindex, items; - GtkWidget *view; - GtkTreeIter iter; - GtkTreePath *path; - GtkTreeView *treeview; - GtkTreeModel *model; - GtkTreeViewColumn *column; - - treeview = g_object_get_data (G_OBJECT (window), "tab_selector_treeview"); - model = gtk_tree_view_get_model (treeview); - items = gtk_tree_model_iter_n_children (model, NULL) -1; - gtk_tree_view_get_cursor (treeview, &path, &column); - pindex = gtk_tree_path_get_indices (path); - if(!pindex) - return; - iindex = *pindex; - gtk_tree_path_free(path); - - if (event->state & GDK_SHIFT_MASK) - iindex = iindex == 0 ? items : iindex-1; - else - iindex = iindex == items ? 0 : iindex+1; - - path = gtk_tree_path_new_from_indices(iindex, -1); - column = gtk_tree_view_get_column (GTK_TREE_VIEW (treeview), 1); - gtk_tree_view_set_cursor (GTK_TREE_VIEW (treeview), path, column, FALSE); - - gtk_tree_model_get_iter (model, &iter, path); - gtk_tree_model_get (model, &iter, TAB_POINTER, &view, -1); - - if (midori_extension_get_boolean (thisExtension, "ShowTabInBackground")) { - midori_browser_set_current_tab (browser, view); - } else { - GtkImage *image; - GdkPixbuf *snapshot = tab_selector_get_snapshot(MIDORI_VIEW(view), - midori_extension_get_integer(thisExtension, "TabPreviewWidth"), - midori_extension_get_integer(thisExtension, "TabPreviewHeight")); - image = g_object_get_data(G_OBJECT(window), "tab_selector_image"); - gtk_image_set_from_pixbuf(image, snapshot); - } - gtk_tree_path_free(path); -} - -static gboolean tab_selector_handle_events (GtkWidget *widget, - GdkEventKey *event, - MidoriBrowser *browser) -{ - /* tab -> 23 - ctrl -> 37 */ - gint treeitems; - static GtkWidget *window; - if(event->type == GDK_KEY_PRESS && event->hardware_keycode == 23 && event->state & GDK_CONTROL_MASK) { - treeitems = gtk_notebook_get_n_pages (GTK_NOTEBOOK ( - katze_object_get_object(browser, "notebook"))); - if(treeitems > 1) { - if(!GTK_IS_WINDOW(window)) { - switchEvent = FALSE; - window = tab_selector_init_window(browser); - } - tab_selector_window_walk(window, event, browser); - } - return TRUE; - } else if(event->type == GDK_KEY_RELEASE && event->hardware_keycode == 37 && GTK_IS_WINDOW(window)) { - switchEvent = TRUE; - if(midori_extension_get_boolean(thisExtension, "ShowTabInBackground")) { - GtkWidget *page; - page = katze_object_get_object(browser, "tab"); - - GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_remove(list, page); - list = g_list_prepend(list, page); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); - } else { - GtkTreePath *path; - GtkTreeViewColumn *column; - GtkTreeIter iter; - GtkWidget *view, *treeview; - GtkTreeModel *model; - - treeview = g_object_get_data(G_OBJECT(window), "tab_selector_treeview"); - model = gtk_tree_view_get_model(GTK_TREE_VIEW(treeview)); - - gtk_tree_view_get_cursor ( - GTK_TREE_VIEW(treeview), &path, &column); - gtk_tree_model_get_iter ( - model, &iter, path); - gtk_tree_model_get ( - model, &iter, TAB_POINTER, &view, -1); - midori_browser_set_current_tab (browser, view); - gtk_tree_path_free (path); - } - gtk_widget_destroy(window); - window = NULL; - return TRUE; - } - return FALSE; -} - -static void tab_selector_switch_page (GtkNotebook *notebook, - GtkNotebookPage *page_, - guint page_num, - MidoriBrowser *browser) -{ - if(switchEvent) { - /* Don't know why *page_ points to the wrong address */ - GtkWidget *page; - page = katze_object_get_object(browser, "tab"); - - GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_remove(list, page); - list = g_list_prepend(list, page); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); - } -} - -static void -tab_selector_browser_add_tab_cb (MidoriBrowser *browser, - GtkWidget *view, - MidoriExtension *extension) -{ - GtkWidget* web_view; - GList* list; - - g_return_if_fail (MIDORI_IS_VIEW (view)); - - web_view = midori_view_get_web_view (MIDORI_VIEW(view)); - - g_signal_connect (web_view, "key_press_event", - G_CALLBACK (tab_selector_handle_events), browser); - g_signal_connect (web_view, "key_release_event", - G_CALLBACK (tab_selector_handle_events), browser); - - list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_append(list, view); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); -} - -static void -tab_selector_browser_remove_tab_cb (MidoriBrowser *browser, - GtkWidget *view, - MidoriExtension *extension) -{ - GList *list = g_object_get_data(G_OBJECT(browser), "tab_selector_list"); - list = g_list_remove(list, view); - g_object_set_data(G_OBJECT(browser), "tab_selector_list", list); -} - -static void -tab_selector_disconnect_tab_cb (GtkWidget *view, - MidoriBrowser *browser) -{ - g_signal_handlers_disconnect_by_func ( - view, tab_selector_handle_events, browser); -} - -static void -tab_selector_app_add_browser_cb (MidoriApp *app, - MidoriBrowser *browser, - MidoriExtension *extension) -{ - GtkWidget *navigationbar, *notebook; - - g_object_set_data(G_OBJECT(browser), "tab_selector_list", NULL); - - g_signal_connect (browser, "add-tab", - G_CALLBACK (tab_selector_browser_add_tab_cb), extension); - g_signal_connect (browser, "remove-tab", - G_CALLBACK (tab_selector_browser_remove_tab_cb), extension); - - navigationbar = katze_object_get_object(browser, "navigationbar"); - g_signal_connect (navigationbar, "key_press_event", - G_CALLBACK (tab_selector_handle_events), browser); - g_signal_connect (navigationbar, "key_release_event", - G_CALLBACK (tab_selector_handle_events), browser); - g_object_unref(navigationbar); - - notebook = katze_object_get_object(browser, "notebook"); - g_signal_connect_after (notebook, "switch-page", - G_CALLBACK (tab_selector_switch_page), browser); - g_object_unref(notebook); -} - -static void -tab_selector_app_remove_browser_cb (MidoriApp *app, - MidoriBrowser *browser, - MidoriExtension *extension) -{ - GList *list = g_object_get_data (G_OBJECT (browser), "tab_selector_list"); - g_list_free (list); -} - -static void -tab_selector_disconnect_browser_cb (MidoriApp *app, - MidoriBrowser *browser, - MidoriExtension *extension) -{ - GtkWidget *navigationbar, *notebook; - - midori_browser_foreach (browser, - (GtkCallback)tab_selector_disconnect_tab_cb, browser); - - g_signal_handlers_disconnect_by_func ( - browser, tab_selector_browser_add_tab_cb, extension); - g_signal_handlers_disconnect_by_func ( - browser, tab_selector_browser_remove_tab_cb, extension); - g_signal_handlers_disconnect_by_func ( - katze_object_get_object (browser, "navigationbar"), - tab_selector_handle_events, browser); - - navigationbar = katze_object_get_object (browser, "navigationbar"); - g_signal_handlers_disconnect_by_func (navigationbar, - tab_selector_handle_events, browser); - g_signal_handlers_disconnect_by_func (navigationbar, - tab_selector_handle_events, browser); - g_object_unref (navigationbar); - - notebook = katze_object_get_object (browser, "notebook"); - g_signal_handlers_disconnect_by_func (notebook, - tab_selector_switch_page, browser); - g_object_unref (notebook); -} - -static void -tab_selector_activate_cb (MidoriExtension *extension, - MidoriApp *app) -{ - GtkWidget *view; - KatzeArray *browsers; - MidoriBrowser *browser; - guint i, j; - - browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) { - j = 0; - tab_selector_app_add_browser_cb (app, browser, extension); - while((view = midori_browser_get_nth_tab(browser, j++))) - tab_selector_browser_add_tab_cb(browser, view, extension); - } - g_object_unref (browsers); - g_signal_connect (app, "add-browser", - G_CALLBACK (tab_selector_app_add_browser_cb), extension); - g_signal_connect (app, "remove-browser", - G_CALLBACK (tab_selector_app_remove_browser_cb), extension); -} - -static void -tab_selector_deactivate_cb (MidoriExtension *extension, - GtkWidget *foo) -{ - MidoriApp* app = midori_extension_get_app (extension); - KatzeArray *browsers; - MidoriBrowser *browser; - guint i; - - g_signal_handlers_disconnect_by_func ( - app, tab_selector_app_add_browser_cb, extension); - g_signal_handlers_disconnect_by_func ( - app, tab_selector_app_remove_browser_cb, extension); - - browsers = katze_object_get_object (app, "browsers"); - i = 0; - while ((browser = katze_array_get_nth_item (browsers, i++))) - tab_selector_disconnect_browser_cb (app, browser, extension); - g_object_unref (browsers); -} - -MidoriExtension* -extension_init (void) -{ - MidoriExtension *extension = g_object_new (MIDORI_TYPE_EXTENSION, - "name", _("Tab History List"), - "description", _("Allows to switch tabs by choosing from a " - "list sorted by last usage"), - "version", "0.1", - "authors", "André Stösel ", - NULL); - - g_signal_connect (extension, "activate", - G_CALLBACK (tab_selector_activate_cb), NULL); - g_signal_connect (extension, "deactivate", - G_CALLBACK (tab_selector_deactivate_cb), NULL); - - midori_extension_install_boolean (extension, "ShowTabInBackground", FALSE); - midori_extension_install_integer (extension, "TitleColumnWidth", 300); - midori_extension_install_integer (extension, "TabPreviewWidth", 200); - midori_extension_install_integer (extension, "TabPreviewHeight", 200); - thisExtension = extension; - switchEvent = TRUE; - - return extension; -} - -- 2.39.5