X-Git-Url: http://git.tdb.fi/?p=pmount-gui.git;a=blobdiff_plain;f=main.c;h=2472f5db6057f2b1e2b4b31175f333e124f7a3ae;hp=bed5e1bf0dd0964c69e6fa161816e6d05a9ec075;hb=ccbbca646ac2845444b6d9e300e6aec4c13a87cb;hpb=ccc2b1b7ed981618ac13bedf540de24256d4431f

diff --git a/main.c b/main.c
index bed5e1b..2472f5d 100644
--- a/main.c
+++ b/main.c
@@ -224,25 +224,25 @@ char **get_fstab_devices(void)
 	return get_mount_entries("/etc/fstab", &is_user_mountable);
 }
 
-int is_in_array(char **names, char *devname)
+int is_in_array(char **array, char *str)
 {
 	int i;
-	if(!names || !devname)
+	if(!array || !str)
 		return 0;
-	for(i=0; names[i]; ++i)
-		if(!strcmp(devname, names[i]))
+	for(i=0; array[i]; ++i)
+		if(!strcmp(str, array[i]))
 			return 1;
 	return 0;
 }
 
-void free_device_names(char **names)
+void free_string_array(char **array)
 {
 	int i;
-	if(!names)
+	if(!array)
 		return;
-	for(i=0; names[i]; ++i)
-		free(names[i]);
-	free(names);
+	for(i=0; array[i]; ++i)
+		free(array[i]);
+	free(array);
 }
 
 int is_removable(char *devpath)
@@ -293,18 +293,18 @@ int check_buses(char *devpath, char **buses)
 			char linkbuf[256];
 			strcpy(ptr, "/subsystem");
 			len = readlink(fnbuf, linkbuf, sizeof(linkbuf)-1);
-			*ptr = 0;
 
 			if(len!=-1)
 			{
-				int i;
 				linkbuf[len] = 0;
 				for(; (len>0 && linkbuf[len-1]!='/'); --len) ;
 				if(verbosity>=2)
+				{
+					*ptr = 0;
 					printf("  Subsystem of %s is %s\n", fnbuf, linkbuf+len);
-				for(i=0; buses[i]; ++i)
-					if(strcmp(linkbuf+len, buses[i])==0)
-						return 1;
+				}
+				if(is_in_array(buses, linkbuf+len))
+					return 1;
 			}
 		}
 
@@ -501,7 +501,7 @@ Device *get_devices(void)
 	}
 
 	free(nodes);
-	free_device_names(mounted);
+	free_string_array(mounted);
 
 	if(devices)
 	{
@@ -634,6 +634,23 @@ void row_activated(GtkTreeView *list, GtkTreePath *path, GtkTreeViewColumn *colu
 	(void)column;
 }
 
+void button_clicked(GtkButton *button, gpointer user_data)
+{
+	GtkWidget *list = (GtkWidget *)user_data;
+	GtkTreeSelection *selection;
+	GtkTreeIter iter;
+	GtkTreeModel *model;
+	GtkTreePath *path;
+
+	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
+	gtk_tree_selection_get_selected(selection, &model, &iter);
+	path = gtk_tree_model_get_path(model, &iter);
+	gtk_tree_view_row_activated(GTK_TREE_VIEW(list), path, gtk_tree_view_get_column(GTK_TREE_VIEW(list), 0));
+	gtk_tree_path_free(path);
+
+	(void)button;
+}
+
 gboolean key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 {
 	if(event->key.keyval==GDK_KEY_Escape)
@@ -651,10 +668,12 @@ gboolean key_press(GtkWidget *widget, GdkEvent *event, gpointer user_data)
 int main(int argc, char **argv)
 {
 	GtkWidget *window;
+	GtkWidget *box;
 	GtkWidget *viewport;
 	GtkWidget *list;
 	GtkListStore *store;
 	GtkTreeSelection *selection;
+	GtkWidget *button;
 	GtkTreeIter iter;
 	Device *devices;
 	int i;
@@ -680,9 +699,12 @@ int main(int argc, char **argv)
 	g_signal_connect(window, "destroy", G_CALLBACK(&gtk_main_quit), NULL);
 	g_signal_connect(window, "key-press-event", G_CALLBACK(&key_press), NULL);
 
+	box = gtk_vbox_new(FALSE, 5);
+	gtk_container_add(GTK_CONTAINER(window), box);
+
 	viewport = gtk_viewport_new(NULL, NULL);
 	gtk_viewport_set_shadow_type(GTK_VIEWPORT(viewport), GTK_SHADOW_IN);
-	gtk_container_add(GTK_CONTAINER(window), viewport);
+	gtk_box_pack_start(GTK_BOX(box), viewport, TRUE, TRUE, 0);
 
 	list = gtk_tree_view_new();
 	gtk_container_add(GTK_CONTAINER(viewport), list);
@@ -695,6 +717,10 @@ int main(int argc, char **argv)
 
 	selection = gtk_tree_view_get_selection(GTK_TREE_VIEW(list));
 
+	button = gtk_button_new_with_label(umount ? "Unmount" : "Mount");
+	g_signal_connect(button, "clicked", G_CALLBACK(&button_clicked), list);
+	gtk_box_pack_start(GTK_BOX(box), button, FALSE, TRUE, 0);
+
 	devices = get_devices();
 	n_listed = 0;
 	if(devices)