From 1628a71f8bdc7b7324a303b9cb8806ad17f3faf9 Mon Sep 17 00:00:00 2001 From: Gergely Polonkai Date: Thu, 31 Jul 2014 12:24:14 +0200 Subject: [PATCH] Remove URI from AgWindowPrivate --- src/ag-app.c | 4 ---- src/ag-window.c | 26 -------------------------- src/ag-window.h | 5 ----- 3 files changed, 35 deletions(-) diff --git a/src/ag-app.c b/src/ag-app.c index b7ff558..3f4423f 100644 --- a/src/ag-app.c +++ b/src/ag-app.c @@ -138,7 +138,6 @@ ag_app_open_chart(AgApp *app, GFile *file) GtkWidget *window; AgChart *chart; GError *err = NULL; - gchar *uri; if ((chart = ag_chart_load_from_file(file, &err)) == NULL) { g_print("Error: '%s'\n", err->message); @@ -149,9 +148,6 @@ ag_app_open_chart(AgApp *app, GFile *file) window = ag_app_create_window(app); ag_window_set_chart(AG_WINDOW(window), chart); ag_window_update_from_chart(AG_WINDOW(window)); - uri = g_file_get_uri(file); - ag_window_set_uri(AG_WINDOW(window), uri); - g_free(uri); ag_window_change_tab(AG_WINDOW(window), "chart"); } diff --git a/src/ag-window.c b/src/ag-window.c index 4368316..2c194c5 100644 --- a/src/ag-window.c +++ b/src/ag-window.c @@ -44,7 +44,6 @@ struct _AgWindowPrivate { AgSettings *settings; AgChart *chart; - gchar *uri; gboolean aspect_table_populated; GtkTextBuffer *note_buffer; GtkListStore *house_system_model; @@ -1024,10 +1023,6 @@ ag_window_list_item_activated_cb(GdMainView *view, ag_window_update_from_chart(window); - if (priv->uri) { - g_free(priv->uri); - } - ag_window_change_tab(window, "chart"); return FALSE; @@ -1113,7 +1108,6 @@ ag_window_init(AgWindow *window) ); priv->chart = NULL; - priv->uri = NULL; g_action_map_add_action_entries( G_ACTION_MAP(window), @@ -1336,26 +1330,6 @@ ag_window_get_chart(AgWindow *window) return priv->chart; } -void -ag_window_set_uri(AgWindow *window, const gchar *uri) -{ - AgWindowPrivate *priv = ag_window_get_instance_private(window); - - if (priv->uri != NULL) { - g_free(priv->uri); - } - - priv->uri = g_strdup(uri); -} - -gchar * -ag_window_get_uri(AgWindow *window) -{ - AgWindowPrivate *priv = ag_window_get_instance_private(window); - - return g_strdup(priv->uri); -} - void ag_window_settings_restore(GtkWindow *window, GSettings *settings) { diff --git a/src/ag-window.h b/src/ag-window.h index ca5c037..c4ba531 100644 --- a/src/ag-window.h +++ b/src/ag-window.h @@ -50,11 +50,6 @@ AgChart *ag_window_get_chart(AgWindow *window); void ag_window_update_from_chart(AgWindow *window); -void ag_window_set_uri(AgWindow *window, - const gchar *uri); - -gchar *ag_window_get_uri(AgWindow *window); - void ag_window_settings_restore(GtkWindow *window, GSettings *settings);