feca2d2e32
(all our patches are accepted upstream) - set a default device via gconf (from antoine) ok ajacoutot@
50 lines
2.0 KiB
Plaintext
50 lines
2.0 KiB
Plaintext
$OpenBSD: patch-src_prefsdlg_c,v 1.2 2008/08/19 22:37:40 jasper Exp $
|
|
--- src/prefsdlg.c.orig Mon Aug 4 10:29:47 2008
|
|
+++ src/prefsdlg.c Mon Aug 4 10:33:29 2008
|
|
@@ -25,6 +25,7 @@
|
|
#include "filebrowser.h"
|
|
#include "devices.h"
|
|
|
|
+#define DEVICELIST_COL_ID DEVICELIST_COL_NODE
|
|
|
|
/* Prefs dialog glade widget names */
|
|
static const gchar *const widget_prefsdlg = "prefsDlg";
|
|
@@ -41,7 +42,6 @@ static const gchar *const widget_prefsdlg_backend = "c
|
|
|
|
static const gint DEVICELIST_COL_ICON = 0;
|
|
static const gint DEVICELIST_COL_NAME = 1;
|
|
-static const gint DEVICELIST_COL_ID = 2;
|
|
static const gint DEVICELIST_COL_NODE = 3;
|
|
static const gint DEVICELIST_COL_MOUNT = 4;
|
|
static const gint DEVICELIST_WRITE_CDR = 5;
|
|
@@ -150,15 +150,6 @@ prefsdlg_create_device_list()
|
|
gtk_tree_view_column_set_attributes(col, renderer, "text", DEVICELIST_COL_NAME, NULL);
|
|
gtk_tree_view_append_column(GTK_TREE_VIEW(device_list), col);
|
|
|
|
- /* Second column to display the device id */
|
|
- renderer = gtk_cell_renderer_text_new();
|
|
- col = gtk_tree_view_column_new_with_attributes(_("Id"), renderer,
|
|
- "text", DEVICELIST_COL_ID, NULL);
|
|
- g_object_set_property(G_OBJECT(renderer), "editable", &value);
|
|
- g_signal_connect(renderer, "edited", (GCallback)prefsdlg_device_cell_edited,
|
|
- (gpointer)&DEVICELIST_COL_ID);
|
|
- gtk_tree_view_append_column(GTK_TREE_VIEW(device_list), col);
|
|
-
|
|
/* Third column to display the device node */
|
|
renderer = gtk_cell_renderer_text_new();
|
|
col = gtk_tree_view_column_new_with_attributes(_("Node"), renderer,
|
|
@@ -469,8 +460,13 @@ prefsdlg_on_add(GtkButton *button, gpointer user_data
|
|
gtk_list_store_set(device_model, &iter,
|
|
DEVICELIST_COL_ICON, GNOME_STOCK_PIXMAP_CDROM,
|
|
DEVICELIST_COL_NAME, "New CD Burner",
|
|
+#if defined(__OpenBSD__)
|
|
+ DEVICELIST_COL_ID, "",
|
|
+ DEVICELIST_COL_NODE, "/dev/rcd0c",
|
|
+#else
|
|
DEVICELIST_COL_ID, "1,0,0",
|
|
DEVICELIST_COL_NODE, "/dev/cdrom",
|
|
+#endif
|
|
DEVICELIST_COL_MOUNT, "/mnt/cdrom", -1);
|
|
}
|
|
|