[Xfce4-commits] <midori:master> Remove freeze, thaw and set_uri from MidoriLocationAction

[Christian Dywan]

Updating branch refs/heads/master
         to 2d1d19de23be79c7274b55fd1507fde126adb022 (commit)
       from 34d7a8033bf718a815130e8a7e682cdeae1485e2 (commit)

commit 2d1d19de23be79c7274b55fd1507fde126adb022
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Jul 31 13:59:48 2010 +0200

    Remove freeze, thaw and set_uri from MidoriLocationAction

 midori/midori-browser.c        |   10 ++++----
 midori/midori-locationaction.c |   47 ----------------------------------------
 midori/midori-locationaction.h |   10 --------
 3 files changed, 5 insertions(+), 62 deletions(-)

diff --git a/midori/midori-browser.c b/midori/midori-browser.c
index f3d1d71..0e3e763 100644
--- a/midori/midori-browser.c
+++ b/midori/midori-browser.c
@@ -406,7 +406,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
         MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
         if (text && *text)
         {
-            midori_location_action_set_uri (location_action, browser->statusbar_text);
+            midori_location_action_set_text (location_action, browser->statusbar_text);
             midori_location_action_set_icon (location_action, NULL);
             midori_location_action_set_secondary_icon (location_action, NULL);
         }
@@ -421,7 +421,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
                 else
                     midori_location_action_set_secondary_icon (
                         location_action, GTK_STOCK_JUMP_TO);
-                midori_location_action_set_uri (location_action,
+                midori_location_action_set_text (location_action,
                     midori_view_get_display_uri (MIDORI_VIEW (view)));
                 midori_location_action_set_icon (location_action,
                     midori_view_get_icon (MIDORI_VIEW (view)));
@@ -556,7 +556,7 @@ midori_view_notify_load_status_cb (GtkWidget*      widget,
     {
         if (midori_view_get_load_status (view) == MIDORI_LOAD_COMMITTED)
         {
-            midori_location_action_set_uri (
+            midori_location_action_set_text (
                 MIDORI_LOCATION_ACTION (action), uri);
             midori_location_action_set_secondary_icon (
                 MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO);
@@ -601,7 +601,7 @@ midori_view_notify_uri_cb (GtkWidget*     view,
     {
         const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
         GtkAction* action = _action_by_name (browser, "Location");
-        midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri);
+        midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
     }
 }
 
@@ -3492,7 +3492,7 @@ _action_location_reset_uri (GtkAction*     action,
     const gchar* uri;
 
     uri = midori_browser_get_current_uri (browser);
-    midori_location_action_set_uri (MIDORI_LOCATION_ACTION (action), uri);
+    midori_location_action_set_text (MIDORI_LOCATION_ACTION (action), uri);
 }
 
 
diff --git a/midori/midori-locationaction.c b/midori/midori-locationaction.c
index 29484d9..5b77ac5 100644
--- a/midori/midori-locationaction.c
+++ b/midori/midori-locationaction.c
@@ -568,34 +568,6 @@ midori_location_action_entry_for_proxy (GtkWidget* proxy)
     return entry;
 }
 
-/**
- * midori_location_action_freeze:
- * @location_action: a #MidoriLocationAction
- *
- * Freezing of the action doesn't do anything.
- *
- * Deprecated: 0.2.3
- **/
-void
-midori_location_action_freeze (MidoriLocationAction* location_action)
-{
-    /* Nothing to do */
-}
-
-/**
- * midori_location_action_thaw:
- * @location_action: a #MidoriLocationAction
- *
- * Thawing of the action doesn't do anything.
- *
- * Deprecated: 0.2.3
- **/
-void
-midori_location_action_thaw (MidoriLocationAction* location_action)
-{
-    /* Nothing to do */
-}
-
 static void
 midori_location_action_init (MidoriLocationAction* location_action)
 {
@@ -1434,25 +1406,6 @@ midori_location_action_set_text (MidoriLocationAction* location_action,
 }
 
 /**
- * midori_location_action_set_uri:
- * @location_action: a #MidoriLocationAction
- * @uri: an URI string
- *
- * Sets the entry URI to @uri and, if applicable, updates the icon.
- *
- * Deprecated: 0.2.0
- **/
-void
-midori_location_action_set_uri (MidoriLocationAction* location_action,
-                                const gchar*          uri)
-{
-    g_return_if_fail (MIDORI_IS_LOCATION_ACTION (location_action));
-    g_return_if_fail (uri != NULL);
-
-    midori_location_action_set_text (location_action, uri);
-}
-
-/**
  * midori_location_action_set_icon:
  * @location_action: a #MidoriLocationAction
  * @icon: a #GdkPixbuf or %NULL
diff --git a/midori/midori-locationaction.h b/midori/midori-locationaction.h
index 3decc54..fd70e9c 100644
--- a/midori/midori-locationaction.h
+++ b/midori/midori-locationaction.h
@@ -36,12 +36,6 @@ typedef struct _MidoriLocationActionClass    MidoriLocationActionClass;
 GType
 midori_location_action_get_type             (void) G_GNUC_CONST;
 
-void
-midori_location_action_freeze              (MidoriLocationAction* location_action);
-
-void
-midori_location_action_thaw                (MidoriLocationAction* location_action);
-
 const gchar*
 midori_location_action_get_text             (MidoriLocationAction* location_action);
 
@@ -53,10 +47,6 @@ const gchar*
 midori_location_action_get_uri              (MidoriLocationAction* location_action);
 
 void
-midori_location_action_set_uri              (MidoriLocationAction* location_action,
-                                             const gchar*          uri);
-
-void
 midori_location_action_set_icon             (MidoriLocationAction* location_action,
                                              GdkPixbuf*            icon);