diff options
| author | Xan Lopez <xlopez@igalia.com> | 2011-04-20 16:14:05 +0800 |
|---|---|---|
| committer | Xan Lopez <xlopez@igalia.com> | 2011-04-21 01:51:46 +0800 |
| commit | 85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5 (patch) | |
| tree | d42a54e25eda179c70d46f2b376b67f1d2d1b929 /src | |
| parent | a78edd0144a01081ac254b40228c1b7c488df711 (diff) | |
| download | gsoc2013-epiphany-85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5.tar gsoc2013-epiphany-85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5.tar.gz gsoc2013-epiphany-85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5.tar.bz2 gsoc2013-epiphany-85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5.tar.lz gsoc2013-epiphany-85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5.tar.xz gsoc2013-epiphany-85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5.tar.zst gsoc2013-epiphany-85e3c2e1129a1d0d3d5dd0c1bdab883ea7b027b5.zip | |
Remove a few GCC 4.6.0 warnings
Diffstat (limited to 'src')
| -rw-r--r-- | src/bookmarks/ephy-bookmarks.c | 5 | ||||
| -rw-r--r-- | src/ephy-shell.c | 6 | ||||
| -rw-r--r-- | src/ephy-toolbar.c | 4 | ||||
| -rw-r--r-- | src/prefs-dialog.c | 4 |
4 files changed, 3 insertions, 16 deletions
diff --git a/src/bookmarks/ephy-bookmarks.c b/src/bookmarks/ephy-bookmarks.c index ec199dc5f..9708da5cf 100644 --- a/src/bookmarks/ephy-bookmarks.c +++ b/src/bookmarks/ephy-bookmarks.c @@ -119,10 +119,7 @@ static char *impl_resolve_address (EphyBookmarks*, const char*, const char*); static void ephy_local_bookmarks_start_client (EphyBookmarks *bookmarks); #endif -G_DEFINE_TYPE_WITH_CODE (EphyBookmarks, ephy_bookmarks, G_TYPE_OBJECT, - volatile GType flags_type; /* work around gcc's optimiser */ - /* make sure the flags type is known */ - flags_type = EPHY_TYPE_BOOKMARK_PROPERTY;) +G_DEFINE_TYPE (EphyBookmarks, ephy_bookmarks, G_TYPE_OBJECT) static void ephy_bookmarks_init_defaults (EphyBookmarks *eb) diff --git a/src/ephy-shell.c b/src/ephy-shell.c index 6fddf9d2d..ef45fb493 100644 --- a/src/ephy-shell.c +++ b/src/ephy-shell.c @@ -685,11 +685,8 @@ ephy_shell_get_net_monitor (EphyShell *shell) static void toolwindow_show_cb (GtkWidget *widget, EphyShell *es) { - EphySession *session; - LOG ("Ref shell for %s", G_OBJECT_TYPE_NAME (widget)); - session = EPHY_SESSION (ephy_shell_get_session (es)); ephy_session_add_window (ephy_shell->priv->session, GTK_WINDOW (widget)); g_object_ref (ephy_shell); } @@ -697,11 +694,8 @@ toolwindow_show_cb (GtkWidget *widget, EphyShell *es) static void toolwindow_hide_cb (GtkWidget *widget, EphyShell *es) { - EphySession *session; - LOG ("Unref shell for %s", G_OBJECT_TYPE_NAME (widget)); - session = EPHY_SESSION (ephy_shell_get_session (es)); ephy_session_remove_window (ephy_shell->priv->session, GTK_WINDOW (widget)); g_object_unref (ephy_shell); } diff --git a/src/ephy-toolbar.c b/src/ephy-toolbar.c index 84191cee4..4bec11460 100644 --- a/src/ephy-toolbar.c +++ b/src/ephy-toolbar.c @@ -585,9 +585,7 @@ ephy_toolbar_set_zoom (EphyToolbar *toolbar, static void ephy_toolbar_init (EphyToolbar *toolbar) { - EphyToolbarPrivate *priv; - - priv = toolbar->priv = EPHY_TOOLBAR_GET_PRIVATE (toolbar); + toolbar->priv = EPHY_TOOLBAR_GET_PRIVATE (toolbar); egg_editable_toolbar_set_primary_class (EGG_EDITABLE_TOOLBAR (toolbar), TRUE, NULL); } diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 296c6b18c..8c0cd31e3 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -223,7 +223,7 @@ create_node_combo (EphyDialog *dialog, GtkComboBox *combo; GtkCellRenderer *renderer; char *code; - int title_col, data_col; + int title_col; code = g_settings_get_string (EPHY_SETTINGS_WEB, EPHY_PREFS_WEB_DEFAULT_ENCODING); @@ -243,8 +243,6 @@ create_node_combo (EphyDialog *dialog, title_col = ephy_tree_model_node_add_prop_column (nodemodel, G_TYPE_STRING, EPHY_NODE_ENCODING_PROP_TITLE_ELIDED); - data_col = ephy_tree_model_node_add_prop_column - (nodemodel, G_TYPE_STRING, EPHY_NODE_ENCODING_PROP_ENCODING); sortmodel = ephy_tree_model_sort_new (GTK_TREE_MODEL (nodemodel)); |