[Xfce4-commits] <ristretto:master> Update preferences dialog, add .desktop file for preferences.

[Stephan Arts]

Updating branch refs/heads/master
         to 036198d17a53ddf43484805536c0e30b614bd65f (commit)
       from e9aaa9291ddec312b56422481953b510dd68d960 (commit)

commit 036198d17a53ddf43484805536c0e30b614bd65f
Author: Stephan Arts <stephan at xfce.org>
Date:   Fri Oct 28 17:00:31 2011 +0200

    Update preferences dialog, add .desktop file for preferences.

 Makefile.am                   |    2 +-
 ristretto-settings.desktop.in |   14 ++++++++++++++
 src/main.c                    |    2 +-
 src/preferences_dialog.c      |    4 ++--
 4 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index ba1a733..12967ea 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,7 @@
 SUBDIRS = src po icons docs
 
 desktopdir = $(datadir)/applications
-desktop_in_files = ristretto.desktop.in
+desktop_in_files = ristretto.desktop.in ristretto-settings.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
diff --git a/ristretto-settings.desktop.in b/ristretto-settings.desktop.in
new file mode 100644
index 0000000..59713d0
--- /dev/null
+++ b/ristretto-settings.desktop.in
@@ -0,0 +1,14 @@
+[Desktop Entry]
+Version=1.0
+_Name=Image Viewer
+_Comment=Configure the Xfce Image Viewer
+_GenericName=Image Viewer
+Exec=ristretto --settings
+Icon=ristretto
+Terminal=false
+Type=Application
+X-MultipleArgs=false
+Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
+StartupNotify=true
+OnlyShowIn=XFCE;
+X-XfcePluggable=false
diff --git a/src/main.c b/src/main.c
index 5a32c77..0794838 100644
--- a/src/main.c
+++ b/src/main.c
@@ -153,7 +153,7 @@ main(int argc, char **argv)
     else
     {
         window = rstto_preferences_dialog_new (NULL);
-        while (gtk_dialog_run (GTK_DIALOG(window)) != GTK_RESPONSE_HELP)
+        while (gtk_dialog_run (GTK_DIALOG(window)) == GTK_RESPONSE_HELP)
         {
             rstto_launch_help ();
         }
diff --git a/src/preferences_dialog.c b/src/preferences_dialog.c
index f0af91b..bc8b97a 100644
--- a/src/preferences_dialog.c
+++ b/src/preferences_dialog.c
@@ -369,8 +369,8 @@ GtkWidget *
 rstto_preferences_dialog_new (GtkWindow *parent)
 {
     GtkWidget *dialog = g_object_new (RSTTO_TYPE_PREFERENCES_DIALOG,
-                                      "title", _("Preferences"),
-                                      "icon-name", GTK_STOCK_PREFERENCES,
+                                      "title", _("Image Viewer Preferences"),
+                                      "icon-name", "ristretto",
                                       NULL);
     gtk_window_set_transient_for (GTK_WINDOW (dialog), parent);