added missing build file

[prss.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index 46e18bc..20b9b14 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -29,8 +29,9 @@
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
+#include <config.h>
 #include "http.h"
-#include "log.h"
+#include <plog.h>
 #include "ttrss.h"
 #include "ttrss_ws.h"
 #include "webbrowser.h"
@@ -446,14 +447,19 @@ void headline_row_activated_cbk(GtkWidget *widget, gpointer data)
 
 static void save_settings()
 {
-       int w, h;
+       int w, h, x, y;
 
-       gtk_window_get_size(window,
-                           &w,
-                           &h);
+       gtk_window_get_size(window, &w, &h);
+       gtk_window_get_position(window, &x, &y);
 
+       log_debug("save_settings(): x=%d, y=%d, w=%d, h=%d", x, y, w, h);
+
+       g_settings_set_int(settings, "window-x", x);
+       g_settings_set_int(settings, "window-y", y);
        g_settings_set_int(settings, "window-width", w);
        g_settings_set_int(settings, "window-height", h);
+
+       g_settings_sync();
 }
 
 gboolean
@@ -576,9 +582,13 @@ int main(int argc, char **argv)
                 NULL);
        window = GTK_WINDOW(gtk_builder_get_object(builder, "window"));
 
-       gtk_window_set_default_size(GTK_WINDOW(window),
-                                   g_settings_get_int(settings, "window-width"),
-                                   g_settings_get_int(settings, "window-height"));
+       gtk_window_set_default_size
+               (window,
+                g_settings_get_int(settings, "window-width"),
+                g_settings_get_int(settings, "window-height"));
+       gtk_window_move(window,
+                       g_settings_get_int(settings, "window-x"),
+                       g_settings_get_int(settings, "window-y"));
 
        w_feedtree = GTK_TREE_VIEW(gtk_builder_get_object(builder,
                                                          "feed_tree"));
@@ -595,6 +605,9 @@ int main(int argc, char **argv)
 
        panh = GTK_WIDGET(gtk_builder_get_object(builder, "webkit_window"));
 
+       webbrowser_init(GTK_STATUSBAR(gtk_builder_get_object
+                                     (builder, "statusbar")));
+
        gtk_container_add(GTK_CONTAINER(panh), web_get_widget());
 
        g_object_unref(G_OBJECT(builder));