[Goodies-commits] r4082 - xfmpc/trunk/src

[Mike Massonnet]

Author: mmassonnet
Date: 2008-03-21 21:01:41 +0000 (Fri, 21 Mar 2008)
New Revision: 4082

Modified:
   xfmpc/trunk/src/interface.c
Log:
Fix Ctrl+Q to save the window state
* src/interface.c:
  - Add a new action function for Ctrl+Q that calls xfmpc_interface_closed


Modified: xfmpc/trunk/src/interface.c
===================================================================
--- xfmpc/trunk/src/interface.c	2008-03-21 21:01:36 UTC (rev 4081)
+++ xfmpc/trunk/src/interface.c	2008-03-21 21:01:41 UTC (rev 4082)
@@ -50,16 +50,6 @@
                                                                  GdkEventWindowState *event);
 static gboolean         xfmpc_interface_closed                  (XfmpcInterface *interface,
                                                                  GdkEvent *event);
-static void             xfmpc_interface_action_previous         (GtkAction *action,
-                                                                 XfmpcInterface *interface);
-static void             xfmpc_interface_action_pp               (GtkAction *action,
-                                                                 XfmpcInterface *interface);
-static void             xfmpc_interface_action_stop             (GtkAction *action,
-                                                                 XfmpcInterface *interface);
-static void             xfmpc_interface_action_next             (GtkAction *action,
-                                                                 XfmpcInterface *interface);
-static void             xfmpc_interface_action_volume           (GtkAction *action,
-                                                                 XfmpcInterface *interface);
 static void             cb_song_changed                         (XfmpcInterface *interface);
 
 static void             cb_pp_changed                           (XfmpcInterface *interface,
@@ -71,6 +61,18 @@
                                                                  gint volume);
 static void             cb_stopped                              (XfmpcInterface *interface);
 
+static void             xfmpc_interface_action_previous         (GtkAction *action,
+                                                                 XfmpcInterface *interface);
+static void             xfmpc_interface_action_pp               (GtkAction *action,
+                                                                 XfmpcInterface *interface);
+static void             xfmpc_interface_action_stop             (GtkAction *action,
+                                                                 XfmpcInterface *interface);
+static void             xfmpc_interface_action_next             (GtkAction *action,
+                                                                 XfmpcInterface *interface);
+static void             xfmpc_interface_action_volume           (GtkAction *action,
+                                                                 XfmpcInterface *interface);
+static void             xfmpc_interface_action_close            (GtkAction *action,
+                                                                 XfmpcInterface *interface);
 
 
 
@@ -109,7 +111,7 @@
   { "stop", NULL, "", "<control>s", NULL, G_CALLBACK (xfmpc_interface_action_stop), },
   { "next", NULL, "", "<control>f", NULL, G_CALLBACK (xfmpc_interface_action_next), },
   { "volume", NULL, "", "<control>v", NULL, G_CALLBACK (xfmpc_interface_action_volume), },
-  { "quit", NULL, "", "<control>q", NULL, G_CALLBACK (gtk_main_quit), },
+  { "quit", NULL, "", "<control>q", NULL, G_CALLBACK (xfmpc_interface_action_close), },
 };
 
 
@@ -613,3 +615,10 @@
   g_signal_emit_by_name (priv->button_volume, "popup", G_TYPE_NONE);
 }
 
+static void
+xfmpc_interface_action_close (GtkAction *action,
+                              XfmpcInterface *interface)
+{
+  xfmpc_interface_closed (interface, NULL);
+}
+