Rename midori_browser_get/set_current_tab to get/set_tab

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index 3d2bfca4f73f44befe4f2e54b2cfae8316a839a6..ad5e391c23a68b5c7cf1fdb62be69d7b48499552 100644 (file)
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -7659,13 +7659,15 @@ midori_browser_get_nth_tab (MidoriBrowser* browser,
 }
 
 /**
- * midori_browser_set_current_tab:
+ * midori_browser_set_tab:
  * @browser: a #MidoriBrowser
  * @view: a #GtkWidget
  *
  * Switches to the page containing @view.
  *
  * The widget will also grab the focus automatically.
+ *
+ * Since: 0.2.6
  **/
 void
 midori_browser_set_current_tab (MidoriBrowser* browser,
@@ -7685,7 +7687,7 @@ midori_browser_set_current_tab (MidoriBrowser* browser,
 }
 
 /**
- * midori_browser_get_current_tab:
+ * midori_browser_get_tab:
  * @browser: a #MidoriBrowser
  *
  * Retrieves the currently selected tab.
@@ -7695,6 +7697,8 @@ midori_browser_set_current_tab (MidoriBrowser* browser,
  * See also midori_browser_get_current_page().
  *
  * Return value: the selected tab, or %NULL
+ *
+ * Since: 0.2.6
  **/
 GtkWidget*
 midori_browser_get_current_tab (MidoriBrowser* browser)

diff --git a/midori/midori-browser.h b/midori/midori-browser.h
index 78323d32eb036a7a36f7d3454c78212f0f9c8932..7129bcc81ae6d76a0715bb26829dc64159636620 100644 (file)
--- a/midori/midori-browser.h
+++ b/midori/midori-browser.h
@@ -130,9 +130,11 @@ midori_browser_get_nth_tab            (MidoriBrowser*     browser,
 void
 midori_browser_set_current_tab        (MidoriBrowser*     browser,
                                        GtkWidget*         widget);
+#define midori_browser_set_tab midori_browser_set_current_tab
 
 GtkWidget*
 midori_browser_get_current_tab        (MidoriBrowser*     browser);
+#define midori_browser_get_tab midori_browser_get_current_tab
 
 GList*
 midori_browser_get_tabs               (MidoriBrowser*     browser);

diff --git a/midori/midori.vapi b/midori/midori.vapi
index 9d208dd82a05f3360edd4e20f99ee9180c6af4d3..eb0f1f297911ababc07dc5f6635fa7547fc2802e 100644 (file)
--- a/midori/midori.vapi
+++ b/midori/midori.vapi
@@ -54,8 +54,7 @@ namespace Midori {
         public Gtk.Widget panel { get; }
         [NoAccessorMethod]
         public string uri { get; set; }
-        [NoAccessorMethod]
-        public View tab { get; set; }
+        public Gtk.Widget? tab { get; set; }
         [NoAccessorMethod]
         public uint load_status { get; }
         [NoAccessorMethod]