aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXan Lopez <xan@src.gnome.org>2009-01-04 22:50:04 +0800
committerXan Lopez <xan@src.gnome.org>2009-01-04 22:50:04 +0800
commit40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6 (patch)
treeac3702b0cd26ae21f947bfb1d72698a68f824080
parent1ecd13da9865d272b02251f4c119ca7fe7113e64 (diff)
downloadgsoc2013-epiphany-40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6.tar
gsoc2013-epiphany-40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6.tar.gz
gsoc2013-epiphany-40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6.tar.bz2
gsoc2013-epiphany-40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6.tar.lz
gsoc2013-epiphany-40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6.tar.xz
gsoc2013-epiphany-40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6.tar.zst
gsoc2013-epiphany-40f095d25aaedd7e019c4b19c5b1a36a4ab9aed6.zip
ephy-window: g_object_get takes a gpointer as first argument.
svn path=/trunk/; revision=8665
-rw-r--r--src/ephy-window.c13
1 files changed, 6 insertions, 7 deletions
diff --git a/src/ephy-window.c b/src/ephy-window.c
index beac870ae..995fb1f9d 100644
--- a/src/ephy-window.c
+++ b/src/ephy-window.c
@@ -17,7 +17,6 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*
- * $Id$
*/
#include "config.h"
@@ -1285,7 +1284,7 @@ menu_item_select_cb (GtkMenuItem *proxy,
action = g_object_get_data (G_OBJECT (proxy), "gtk-action");
g_return_if_fail (action != NULL);
- g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
+ g_object_get (action, "tooltip", &message, NULL);
if (message)
{
gtk_statusbar_push (GTK_STATUSBAR (window->priv->statusbar),
@@ -1318,7 +1317,7 @@ tool_item_enter_cb (GtkWidget *proxy,
action = g_object_get_data (G_OBJECT (item), "gtk-action");
g_return_val_if_fail (action != NULL, FALSE);
- g_object_get (G_OBJECT (action), "tooltip", &message, NULL);
+ g_object_get (action, "tooltip", &message, NULL);
if (message)
{
gtk_statusbar_push (GTK_STATUSBAR (window->priv->statusbar),
@@ -1803,7 +1802,7 @@ sync_tab_popup_windows (EphyEmbed *embed,
guint num_popups = 0;
char *tooltip = NULL;
- g_object_get (G_OBJECT (embed),
+ g_object_get (embed,
"hidden-popup-count", &num_popups,
NULL);
@@ -1838,7 +1837,7 @@ sync_tab_popups_allowed (EphyEmbed *embed,
"ViewPopupWindows");
g_return_if_fail (GTK_IS_ACTION (action));
- g_object_get (G_OBJECT (embed), "popups-allowed", &allow, NULL);
+ g_object_get (embed, "popups-allowed", &allow, NULL);
g_signal_handlers_block_by_func
(G_OBJECT (action),
@@ -1909,7 +1908,7 @@ sync_tab_zoom (WebKitWebView *web_view, GParamSpec *pspec, EphyWindow *window)
if (window->priv->closing) return;
- g_object_get (G_OBJECT (web_view),
+ g_object_get (web_view,
"zoom-level", &zoom,
NULL);
@@ -3956,7 +3955,7 @@ ephy_window_set_zoom (EphyWindow *window,
web_view = EPHY_GET_WEBKIT_WEB_VIEW_FROM_EMBED (embed);
- g_object_get (G_OBJECT (web_view), "zoom-level", &current_zoom, NULL);
+ g_object_get (web_view, "zoom-level", &current_zoom, NULL);
if (zoom == ZOOM_IN)
{