Close the mount window if esc is pressed

[pmount-gui.git] / main.c

diff --git a/main.c b/main.c
index 6be83527e43da5809cace5ad328f1f0eff36f286..b1dcb1ccc645e57f470fdcbbc6a671bad381d133 100644 (file)
--- a/main.c
+++ b/main.c
@@ -8,6 +8,7 @@
 #include <sys/stat.h>
 #include <sys/wait.h>
 #include <gtk/gtk.h>
+#include <gdk/gdkkeysyms.h>
 
 typedef struct sProperty
 {
@@ -356,7 +357,7 @@ char **get_device_nodes(char *dirname)
                }
                if(duplicate)
                {
-                       if(verbosity>=1)
+                       if(verbosity>=2)
                                printf("Device %s is a duplicate\n", fnbuf);
                        continue;
                }
@@ -513,7 +514,7 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
                pid = fork();
                if(pid==0)
                {
-                       if(verbosity>=2)
+                       if(verbosity>=1)
                        {
                                if(umount)
                                        printf("Running pumount %s\n", device->node);
@@ -571,6 +572,20 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
        (void)column;
 }
 
+gboolean key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data)
+{
+       if(event->key.keyval==GDK_KEY_Escape)
+       {
+               gtk_main_quit();
+               return TRUE;
+       }
+
+       (void)widget;
+       (void)user_data;
+
+       return FALSE;
+}
+
 int main(int argc, char **argv)
 {
        GtkWidget *window;
@@ -600,7 +615,8 @@ int main(int argc, char **argv)
 
        window = gtk_window_new(GTK_WINDOW_TOPLEVEL);
        gtk_container_set_border_width(GTK_CONTAINER(window), 5);
-       g_signal_connect(window, "destroy", &gtk_main_quit, NULL);
+       g_signal_connect(window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
+       g_signal_connect(window, "key-press-event", G_CALLBACK(&key_press), NULL);
 
        viewport = gtk_viewport_new(NULL, NULL);
        gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN);
@@ -608,7 +624,7 @@ int main(int argc, char **argv)
 
        list = gtk_tree_view_new();
        gtk_container_add(GTK_CONTAINER(viewport), list);
-       g_signal_connect(list, "row-activated", (GCallback)&row_activated, &umount);
+       g_signal_connect(list, "row-activated", G_CALLBACK(&row_activated), &umount);
 
        store = gtk_list_store_new(2, G_TYPE_STRING, G_TYPE_POINTER);
        gtk_tree_view_set_model(GTK_TREE_VIEW(list), GTK_TREE_MODEL(store));
@@ -646,7 +662,7 @@ int main(int argc, char **argv)
 
                dialog = gtk_message_dialog_new(NULL, 0, GTK_MESSAGE_WARNING, GTK_BUTTONS_OK,
                        "No devices to %s", (umount ? "unmount" : "mount"));
-               g_signal_connect(dialog, "response", &gtk_main_quit, NULL);
+               g_signal_connect(dialog, "response", G_CALLBACK(&gtk_main_quit), NULL);
                gtk_widget_show_all(dialog);
        }