[Xfce4-commits] <midori:master> Introduce midori_browser_set_current_page_smartly() as public API

[Christian Dywan]

Updating branch refs/heads/master
         to 62930be0820a17d114fd5cf1de1212ab967228f1 (commit)
       from e70bc2cb752db09a1613d826e896fbc57269361c (commit)

commit 62930be0820a17d114fd5cf1de1212ab967228f1
Author: Alexander Butenko <a.butenka at gmail.com>
Date:   Sat Jul 3 03:28:03 2010 -0400

    Introduce midori_browser_set_current_page_smartly() as public API

 midori/midori-browser.c   |   16 ++++++++--------
 midori/midori-browser.h   |    3 +++
 panels/midori-bookmarks.c |   12 ++----------
 panels/midori-history.c   |   12 ++----------
 4 files changed, 15 insertions(+), 28 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index ceb3e70..3f3808b 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -425,9 +425,9 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
     }
 }
 
-static void
-_midori_browser_set_current_page_smartly (MidoriBrowser* browser,
-                                          gint           n)
+void
+midori_browser_set_current_page_smartly (MidoriBrowser* browser,
+                                         gint           n)
 {
     if (!katze_object_get_boolean (browser->settings,
         "open-tabs-in-the-background"))
@@ -2697,7 +2697,7 @@ _action_trash_activate_item_alt (GtkAction*     action,
 
         n = midori_browser_add_uri (browser, katze_item_get_uri (item));
 
-        _midori_browser_set_current_page_smartly (browser, n);
+        midori_browser_set_current_page_smartly (browser, n);
 
         katze_array_remove_item (browser->trash, item);
         _midori_browser_update_actions (browser);
@@ -3419,7 +3419,7 @@ midori_browser_bookmark_homepage_button_press_cb (GtkToolItem*    button,
         g_object_get (browser->settings, "homepage", &homepage, NULL);
         n = midori_browser_add_uri (browser, homepage);
         g_free (homepage);
-        _midori_browser_set_current_page_smartly (browser, n);
+        midori_browser_set_current_page_smartly (browser, n);
         return TRUE;
     }
 
@@ -3781,7 +3781,7 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget*     menuitem,
             if ((uri = katze_item_get_uri (child)) && *uri)
             {
                 n = midori_browser_add_item (browser, child);
-                _midori_browser_set_current_page_smartly (browser, n);
+                midori_browser_set_current_page_smartly (browser, n);
             }
             i++;
         }
@@ -3791,7 +3791,7 @@ midori_browser_bookmark_open_in_tab_activate_cb (GtkWidget*     menuitem,
         if ((uri = katze_item_get_uri (item)) && *uri)
         {
             n = midori_browser_add_item (browser, item);
-            _midori_browser_set_current_page_smartly (browser, n);
+            midori_browser_set_current_page_smartly (browser, n);
         }
     }
 }
@@ -6234,7 +6234,7 @@ midori_bookmarkbar_item_button_press_event_cb (GtkWidget*      toolitem,
         if (katze_item_get_uri (item))
         {
             n = midori_browser_add_uri (browser, katze_item_get_uri (item));
-            _midori_browser_set_current_page_smartly (browser, n);
+            midori_browser_set_current_page_smartly (browser, n);
 
             return TRUE;
         }
diff --git a/midori/midori-browser.h b/midori/midori-browser.h
index 7129bcc..7b0d98c 100644
--- a/midori/midori-browser.h
+++ b/midori/midori-browser.h
@@ -117,6 +117,9 @@ const gchar*
 midori_browser_get_current_uri        (MidoriBrowser*     browser);
 
 void
+midori_browser_set_current_page_smartly (MidoriBrowser* browser,
+                                         gint           n);
+void
 midori_browser_set_current_page       (MidoriBrowser*     browser,
                                        gint               n);
 
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 0a1e7b3..e27df97 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -666,14 +666,10 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget*       menuitem,
             if ((uri = katze_item_get_uri (child)) && *uri)
             {
                 MidoriBrowser* browser;
-                MidoriWebSettings* settings;
 
                 browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks));
                 n = midori_browser_add_item (browser, child);
-                settings = katze_object_get_object (browser, "settings");
-                if (!katze_object_get_boolean (settings, "open-tabs-in-the-background"))
-                    midori_browser_set_current_page (browser, n);
-                g_object_unref (settings);
+                midori_browser_set_current_page_smartly (browser, n);
             }
             i++;
         }
@@ -681,14 +677,10 @@ midori_bookmarks_open_in_tab_activate_cb (GtkWidget*       menuitem,
     else if ((uri = katze_item_get_uri (item)) && *uri)
     {
         MidoriBrowser* browser;
-        MidoriWebSettings* settings;
 
         browser = midori_browser_get_for_widget (GTK_WIDGET (bookmarks));
         n = midori_browser_add_item (browser, item);
-        settings = katze_object_get_object (browser, "settings");
-        if (!katze_object_get_boolean (settings, "open-tabs-in-the-background"))
-            midori_browser_set_current_page (browser, n);
-        g_object_unref (settings);
+        midori_browser_set_current_page_smartly (browser, n);
     }
 }
 
diff --git a/panels/midori-history.c b/panels/midori-history.c
index 83b52b7..bfe469d 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -655,14 +655,10 @@ midori_history_open_in_tab_activate_cb (GtkWidget*     menuitem,
             if ((uri = katze_item_get_uri (child)) && *uri)
             {
                 MidoriBrowser* browser;
-                MidoriWebSettings* settings;
 
                 browser = midori_browser_get_for_widget (GTK_WIDGET (history));
                 n = midori_browser_add_item (browser, child);
-                settings = katze_object_get_object (browser, "settings");
-                if (!katze_object_get_boolean (settings, "open-tabs-in-the-background"))
-                    midori_browser_set_current_page (browser, n);
-                g_object_unref (settings);
+                midori_browser_set_current_page_smartly (browser, n);
             }
         }
     }
@@ -671,14 +667,10 @@ midori_history_open_in_tab_activate_cb (GtkWidget*     menuitem,
         if ((uri = katze_item_get_uri (item)) && *uri)
         {
             MidoriBrowser* browser;
-            MidoriWebSettings* settings;
 
             browser = midori_browser_get_for_widget (GTK_WIDGET (history));
             n = midori_browser_add_item (browser, item);
-            settings = katze_object_get_object (browser, "settings");
-            if (!katze_object_get_boolean (settings, "open-tabs-in-the-background"))
-                midori_browser_set_current_page (browser, n);
-            g_object_unref (settings);
+            midori_browser_set_current_page_smartly (browser, n);
         }
     }
 }