Trim trailing white spaces.

[geeqie.git] / src / window.c

diff --git a/src/window.c b/src/window.c
index 4e14b32..863c75d 100644 (file)
--- a/src/window.c
+++ b/src/window.c
@@ -1,6 +1,6 @@
 /*
  * Geeqie
- * Copyright (C) 2008 The Geeqie Team
+ * Copyright (C) 2008 - 2012 The Geeqie Team
  *
  * Authors: Vladimir Nadvornik / Laurent Monin
  *
@@ -17,7 +17,7 @@
 #include "ui_fileops.h"
 #include "ui_help.h"
 
-GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
+GtkWidget *window_new(GtkWindowType type, const gchar *role, const gchar *icon,
                      const gchar *icon_file, const gchar *subtitle)
 {
        gchar *title;
@@ -39,8 +39,7 @@ GtkWidget *window_new(GtkWindowType type, const gchar *name, const gchar *icon,
        g_free(title);
 
        window_set_icon(window, icon, icon_file);
-       gtk_window_set_role(GTK_WINDOW(window), name);
-       gtk_window_set_wmclass(GTK_WINDOW(window), name, GQ_WMCLASS);
+       gtk_window_set_role(GTK_WINDOW(window), role);
 
        return window;
 }
@@ -66,14 +65,14 @@ void window_set_icon(GtkWidget *window, const gchar *icon, const gchar *file)
                }
 }
 
-gint window_maximized(GtkWidget *window)
+gboolean window_maximized(GtkWidget *window)
 {
        GdkWindowState state;
 
-       if (!window || !window->window) return FALSE;
+       if (!window || !gtk_widget_get_window(window)) return FALSE;
 
-       state = gdk_window_get_state(window->window);
-       return (state & GDK_WINDOW_STATE_MAXIMIZED);
+       state = gdk_window_get_state(gtk_widget_get_window(window));
+       return !!(state & GDK_WINDOW_STATE_MAXIMIZED);
 }
 
 /*
@@ -176,6 +175,7 @@ static gchar *html_browsers[] =
        "mozilla",      NULL,
        "konqueror",    NULL,
        "netscape",     NULL,
+       "opera",        "!opera --remote 'openURL(%s,new-page)'",
        NULL,           NULL
 };
 
@@ -183,11 +183,11 @@ static void help_browser_run(void)
 {
        gchar *name = options->helpers.html_browser.command_name;
        gchar *cmd = options->helpers.html_browser.command_line;
-       gchar *path = g_build_filename(options->documentation.htmldir, "index.html", NULL);
+       gchar *path = g_build_filename(GQ_HTMLDIR, "index.html", NULL);
        gchar *result = NULL;
        gint i;
 
-       i = 0;  
+       i = 0;
        while (!result)
                {
                if ((name && *name) || (cmd && *cmd)) {
@@ -248,8 +248,8 @@ void help_window_show(const gchar *key)
                return;
                }
 
-       path = g_build_filename(options->documentation.helpdir, "README", NULL);
-       help_window = help_window_new(_("Help"), GQ_WMCLASS, "help", path, key);
+       path = g_build_filename(GQ_HELPDIR, "README", NULL);
+       help_window = help_window_new(_("Help"), "help", path, key);
        g_free(path);
 
        g_signal_connect(G_OBJECT(help_window), "destroy",