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

Remove freeze, thaw and set_uri from MidoriLocationAction

Browse source
This commit is contained in:
Christian Dywan 2010-07-31 13:59:48 +02:00
parent 34d7a8033b
commit 2d1d19de23
3 changed files with 5 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
midori/midori-browser.c
View file

@ -406,7 +406,7 @@ _midori_browser_set_statusbar_text (MidoriBrowser* browser,
MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action); MidoriLocationAction* location_action = MIDORI_LOCATION_ACTION (action);
if (text && *text) 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_icon (location_action, NULL);
midori_location_action_set_secondary_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 else
midori_location_action_set_secondary_icon ( midori_location_action_set_secondary_icon (
location_action, GTK_STOCK_JUMP_TO); 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_view_get_display_uri (MIDORI_VIEW (view)));
midori_location_action_set_icon (location_action, midori_location_action_set_icon (location_action,
midori_view_get_icon (MIDORI_VIEW (view))); 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) 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 (action), uri);
midori_location_action_set_secondary_icon ( midori_location_action_set_secondary_icon (
MIDORI_LOCATION_ACTION (action), GTK_STOCK_JUMP_TO); 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)); const gchar* uri = midori_view_get_display_uri (MIDORI_VIEW (view));
GtkAction* action = _action_by_name (browser, "Location"); 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; const gchar* uri;
uri = midori_browser_get_current_uri (browser); 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);
} }

47
midori/midori-locationaction.c
View file

@ -568,34 +568,6 @@ midori_location_action_entry_for_proxy (GtkWidget* proxy)
return entry; 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 static void
midori_location_action_init (MidoriLocationAction* location_action) midori_location_action_init (MidoriLocationAction* location_action)
{ {
@ -1433,25 +1405,6 @@ midori_location_action_set_text (MidoriLocationAction* location_action,
g_object_unref (icon); g_object_unref (icon);
} }
/**
* 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: * midori_location_action_set_icon:
* @location_action: a #MidoriLocationAction * @location_action: a #MidoriLocationAction

10
midori/midori-locationaction.h
View file

@ -36,12 +36,6 @@ typedef struct _MidoriLocationActionClass MidoriLocationActionClass;
GType GType
midori_location_action_get_type (void) G_GNUC_CONST; 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* const gchar*
midori_location_action_get_text (MidoriLocationAction* location_action); midori_location_action_get_text (MidoriLocationAction* location_action);
@ -52,10 +46,6 @@ midori_location_action_set_text (MidoriLocationAction* location_acti
const gchar* const gchar*
midori_location_action_get_uri (MidoriLocationAction* location_action); midori_location_action_get_uri (MidoriLocationAction* location_action);
void
midori_location_action_set_uri (MidoriLocationAction* location_action,
const gchar* uri);
void void
midori_location_action_set_icon (MidoriLocationAction* location_action, midori_location_action_set_icon (MidoriLocationAction* location_action,
GdkPixbuf* icon); GdkPixbuf* icon);