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

Add midori_browser_get_for_widget_utility function

Browse source 
This function will look for a MidoriBrowser according to a
particular widget - even if it's inside a detached panel
window or any other window transient for the browser.
This commit is contained in:
Christian Dywan 2009-04-23 04:10:38 +02:00
parent db0c626ec1
commit 5a43b646b5
1 changed files with 35 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
midori/midori-browser.c
View file

@ -699,7 +699,7 @@ midori_view_add_bookmark_cb (GtkWidget* menuitem,
item = katze_item_new (); item = katze_item_new ();
katze_item_set_uri (item, uri); katze_item_set_uri (item, uri);
browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); browser = midori_browser_get_for_widget (menuitem);
midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE); midori_browser_edit_bookmark_dialog_new (browser, item, FALSE, FALSE);
} }
@ -806,7 +806,7 @@ midori_view_save_as_cb (GtkWidget* menuitem,
{ {
MidoriBrowser* browser; MidoriBrowser* browser;
browser = (MidoriBrowser*)gtk_widget_get_toplevel (menuitem); browser = midori_browser_get_for_widget (menuitem);
midori_browser_save_uri (browser, uri); midori_browser_save_uri (browser, uri);
} }
@ -927,7 +927,7 @@ midori_browser_download_button_clicked_cb (GtkWidget* button,
MidoriBrowser* browser; MidoriBrowser* browser;
GList* buttons; GList* buttons;
browser = MIDORI_BROWSER (gtk_widget_get_toplevel (button)); browser = midori_browser_get_for_widget (button);
switch (webkit_download_get_status (download)) switch (webkit_download_get_status (download))
{ {
@ -3181,7 +3181,7 @@ static gboolean
midori_browser_panel_timeout (GtkWidget* hpaned) midori_browser_panel_timeout (GtkWidget* hpaned)
{ {
gboolean position = gtk_paned_get_position (GTK_PANED (hpaned)); gboolean position = gtk_paned_get_position (GTK_PANED (hpaned));
MidoriBrowser* browser = MIDORI_BROWSER (gtk_widget_get_toplevel (hpaned)); MidoriBrowser* browser = midori_browser_get_for_widget (hpaned);
if (browser->settings) if (browser->settings)
g_object_set (browser->settings, "last-panel-position", position, NULL); g_object_set (browser->settings, "last-panel-position", position, NULL);
browser->panel_timeout = 0; browser->panel_timeout = 0;
@ -5209,6 +5209,37 @@ midori_browser_get_proxy_array (MidoriBrowser* browser)
return browser->proxy_array; return browser->proxy_array;
} }
/**
* midori_browser_get_for_widget:
* @widget: a #GtkWidget
*
* Determines the browser appropriate for the specified widget.
*
* Return value: a #MidoriBrowser
*
* Since 0.1.7
**/
MidoriBrowser*
midori_browser_get_for_widget (GtkWidget* widget)
{
gpointer browser;
g_return_val_if_fail (GTK_IS_WIDGET (widget), NULL);
browser = gtk_widget_get_toplevel (GTK_WIDGET (widget));
if (!MIDORI_IS_BROWSER (browser))
{
if (!GTK_IS_WINDOW (browser))
return NULL;
browser = gtk_window_get_transient_for (GTK_WINDOW (browser));
if (!MIDORI_IS_BROWSER (browser))
return NULL;
}
return MIDORI_BROWSER (browser);
}
/** /**
* midori_browser_quit: * midori_browser_quit:
* @browser: a #MidoriBrowser * @browser: a #MidoriBrowser