debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add work-around for dynamic notebook current tab

Browse source
This commit is contained in:
Christian Dywan 2012-07-03 01:38:55 +02:00
parent f9d32072f4
commit ec2a7446e4
1 changed files with 30 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
midori/midori-browser.c
View file

@ -1522,6 +1522,17 @@ midori_view_search_text_cb (GtkWidget* view,
midori_findbar_search_text (MIDORI_FINDBAR (browser->find), view, found, typing); midori_findbar_search_text (MIDORI_FINDBAR (browser->find), view, found, typing);
} }
static gint
midori_browser_get_n_pages (MidoriBrowser* browser)
{
#ifdef HAVE_GRANITE
return granite_widgets_dynamic_notebook_get_n_tabs (
GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
#else
return gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook));
#endif
}
static gboolean static gboolean
midori_browser_tab_destroy_cb (GtkWidget* widget, midori_browser_tab_destroy_cb (GtkWidget* widget,
MidoriBrowser* browser) MidoriBrowser* browser)
@ -1549,7 +1560,13 @@ midori_browser_tab_destroy_cb (GtkWidget* widget,
so just create an empty one if the last one is closed. so just create an empty one if the last one is closed.
The only exception is when we are closing the window, The only exception is when we are closing the window,
which is indicated by the proxy array having been unset. */ which is indicated by the proxy array having been unset. */
#ifdef HAVE_GRANITE
if (midori_browser_get_current_tab (browser) && midori_browser_get_n_pages (browser) > 0)
g_warning ("FIXME granite_widgets_get_current returns NULL");
if (browser->proxy_array && !midori_browser_get_n_pages (browser))
#else
if (browser->proxy_array && !midori_browser_get_current_tab (browser)) if (browser->proxy_array && !midori_browser_get_current_tab (browser))
#endif
midori_browser_add_uri (browser, ""); midori_browser_add_uri (browser, "");
return FALSE; return FALSE;
} }
@ -2569,8 +2586,7 @@ _action_tab_close_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
{ {
GtkWidget* widget = midori_browser_get_current_tab (browser); GtkWidget* widget = midori_browser_get_current_tab (browser);
gboolean last_tab = gboolean last_tab = midori_browser_get_n_pages (browser) == 1;
midori_browser_get_nth_tab (browser, 1) == NULL;
if (last_tab && sokoke_is_app_or_private ()) if (last_tab && sokoke_is_app_or_private ())
{ {
gtk_widget_destroy (GTK_WIDGET (browser)); gtk_widget_destroy (GTK_WIDGET (browser));
@ -4668,17 +4684,6 @@ _action_inspect_page_activate (GtkAction* action,
webkit_web_inspector_show (inspector); webkit_web_inspector_show (inspector);
} }
static gint
midori_browser_get_n_pages (MidoriBrowser* browser)
{
#ifdef HAVE_GRANITE
return granite_widgets_dynamic_notebook_get_n_tabs (
GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
#else
return gtk_notebook_get_n_pages (GTK_NOTEBOOK (browser->notebook));
#endif
}
static void static void
_action_tab_move_backward_activate (GtkAction* action, _action_tab_move_backward_activate (GtkAction* action,
MidoriBrowser* browser) MidoriBrowser* browser)
@ -7828,8 +7833,20 @@ midori_browser_get_current_tab (MidoriBrowser* browser)
n = midori_browser_get_current_page (browser); n = midori_browser_get_current_page (browser);
if (n >= 0) if (n >= 0)
return midori_browser_get_nth_tab (browser, n); return midori_browser_get_nth_tab (browser, n);
#ifdef HAVE_GRANITE
else
{
GraniteWidgetsTab* tab = granite_widgets_dynamic_notebook_get_current (
GRANITE_WIDGETS_DYNAMIC_NOTEBOOK (browser->notebook));
g_warning ("FIXME granite_widgets_get_tab_position returns NULL");
if (tab == NULL)
g_warning ("granite_widgets_dynamic_notebook_get_current returns NULL");
return tab ? granite_widgets_tab_get_page (tab) : NULL;
}
#else
else else
return NULL; return NULL;
#endif
} }
/** /**