Removed
Link Here
|
1 |
--- src/properties.c.orig 2008-07-26 22:26:43.000000000 +1000 |
2 |
+++ src/properties.c 2008-07-26 22:28:54.000000000 +1000 |
3 |
@@ -23,7 +23,6 @@ |
4 |
|
5 |
if (!(g_ascii_strcasecmp(key, "/apps/synce/trayicon/dccm"))) { |
6 |
const gchar *which_dccm = gconf_value_get_string(value); |
7 |
- GtkWidget *prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm"); |
8 |
GtkWidget *prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm"); |
9 |
GtkWidget *prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal"); |
10 |
GtkWidget *prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm"); |
11 |
@@ -31,33 +30,18 @@ |
12 |
if (!(g_ascii_strcasecmp(which_dccm, "v"))) { |
13 |
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE); |
14 |
gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE); |
15 |
- } else if (!(g_ascii_strcasecmp(which_dccm, "o"))) { |
16 |
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE); |
17 |
- gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE); |
18 |
} else if (!(g_ascii_strcasecmp(which_dccm, "h"))) { |
19 |
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE); |
20 |
gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE); |
21 |
} else { |
22 |
gconf_client_set_string (conf_client, |
23 |
- "/apps/synce/trayicon/dccm", "o", NULL); |
24 |
+ "/apps/synce/trayicon/dccm", "h", NULL); |
25 |
} |
26 |
} |
27 |
} |
28 |
|
29 |
|
30 |
static void |
31 |
-prefs_use_odccm_toggled_cb (GtkWidget *widget, gpointer data) |
32 |
-{ |
33 |
- gboolean state; |
34 |
- GConfClient *conf_client = gconf_client_get_default(); |
35 |
- |
36 |
- state = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (widget)); |
37 |
- if (state) |
38 |
- gconf_client_set_string (conf_client, |
39 |
- "/apps/synce/trayicon/dccm", "o", NULL); |
40 |
-} |
41 |
- |
42 |
-static void |
43 |
prefs_use_vdccm_toggled_cb (GtkWidget *widget, gpointer data) |
44 |
{ |
45 |
gboolean state; |
46 |
@@ -107,7 +91,7 @@ |
47 |
GtkWidget * |
48 |
run_prefs_dialog (SynceTrayIcon *trayicon) |
49 |
{ |
50 |
- GtkWidget *prefs_window, *prefs_use_odccm, *prefs_use_vdccm, *prefs_use_hal, *prefs_start_stop_vdccm, *close_button; |
51 |
+ GtkWidget *prefs_window, *prefs_use_vdccm, *prefs_use_hal, *prefs_start_stop_vdccm, *close_button; |
52 |
gchar *which_dccm; |
53 |
GError *error = NULL; |
54 |
|
55 |
@@ -117,36 +101,30 @@ |
56 |
|
57 |
prefs_window = glade_xml_get_widget (xml, "prefs_window"); |
58 |
|
59 |
- prefs_use_odccm = glade_xml_get_widget (xml, "prefs_use_odccm"); |
60 |
prefs_use_vdccm = glade_xml_get_widget (xml, "prefs_use_vdccm"); |
61 |
prefs_use_hal = glade_xml_get_widget (xml, "prefs_use_hal"); |
62 |
prefs_start_stop_vdccm = glade_xml_get_widget (xml, "prefs_start_stop_vdccm"); |
63 |
|
64 |
if (!(which_dccm = gconf_client_get_string (conf_client, |
65 |
"/apps/synce/trayicon/dccm", &error))) { |
66 |
- which_dccm = g_strdup("o"); |
67 |
+ which_dccm = g_strdup("h"); |
68 |
if (error) { |
69 |
g_warning("%s: Get dccm type from gconf failed: %s", G_STRFUNC, error->message); |
70 |
g_error_free(error); |
71 |
} |
72 |
} |
73 |
|
74 |
- if (!(g_ascii_strcasecmp(which_dccm, "h"))) { |
75 |
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE); |
76 |
- gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE); |
77 |
- } else if (!(g_ascii_strcasecmp(which_dccm, "v"))) { |
78 |
+ if (!(g_ascii_strcasecmp(which_dccm, "v"))) { |
79 |
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_vdccm), TRUE); |
80 |
gtk_widget_set_sensitive(prefs_start_stop_vdccm, TRUE); |
81 |
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_start_stop_vdccm), |
82 |
gconf_client_get_bool (conf_client, |
83 |
"/apps/synce/trayicon/start_vdccm", NULL)); |
84 |
} else { |
85 |
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_odccm), TRUE); |
86 |
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (prefs_use_hal), TRUE); |
87 |
gtk_widget_set_sensitive(prefs_start_stop_vdccm, FALSE); |
88 |
} |
89 |
|
90 |
- g_signal_connect (G_OBJECT (prefs_use_odccm), "toggled", |
91 |
- G_CALLBACK (prefs_use_odccm_toggled_cb), NULL); |
92 |
g_signal_connect (G_OBJECT (prefs_use_vdccm), "toggled", |
93 |
G_CALLBACK (prefs_use_vdccm_toggled_cb), prefs_start_stop_vdccm); |
94 |
g_signal_connect (G_OBJECT (prefs_use_hal), "toggled", |