[Goodies-commits] r5424 - in xfce4-radio-plugin/trunk: . panel-plugin

[Stefan Ott]

Author: cockroach
Date: 2008-09-20 03:28:56 +0000 (Sat, 20 Sep 2008)
New Revision: 5424

Modified:
   xfce4-radio-plugin/trunk/NEWS
   xfce4-radio-plugin/trunk/panel-plugin/radio.c
   xfce4-radio-plugin/trunk/panel-plugin/radio.h
Log:
Moved config file location


Modified: xfce4-radio-plugin/trunk/NEWS
===================================================================
--- xfce4-radio-plugin/trunk/NEWS	2008-09-19 18:19:14 UTC (rev 5423)
+++ xfce4-radio-plugin/trunk/NEWS	2008-09-20 03:28:56 UTC (rev 5424)
@@ -1,6 +1,11 @@
 Get the latest version of this plugin at http://goodies.xfce.org/
 ===============================================================================
 
+v0.4.0 (xx xxx 2008):
+=====================
+ * The "thanks for all the patches"-release
+ * We now use a clearly-defined name for the config file (xfce4/panel/radio.rc)
+
 v0.3.1 (18 Jun 2008):
 =====================
  * The "segfault yourself"-release

Modified: xfce4-radio-plugin/trunk/panel-plugin/radio.c
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/radio.c	2008-09-19 18:19:14 UTC (rev 5423)
+++ xfce4-radio-plugin/trunk/panel-plugin/radio.c	2008-09-20 03:28:56 UTC (rev 5424)
@@ -425,13 +425,14 @@
 }
 
 static XfceRc *
-get_config_file_write_handle (radio_gui *data)
+get_config_rc ()
 {
-	XfcePanelPlugin *plugin = data->plugin;
 	char *file;
 	XfceRc *rc;
 
-	if (!(file = xfce_panel_plugin_save_location (plugin, TRUE)))
+	file = xfce_resource_save_location (XFCE_RESOURCE_CONFIG,
+						RADIO_CONFIG_FILE, TRUE);
+	if (G_UNLIKELY (!file))
 		return NULL;
 
 	rc = xfce_rc_simple_open (file, FALSE);
@@ -449,7 +450,7 @@
 	preset = pop_preset (find_preset_by_freq (data->freq, data), data);
 
 	XfceRc *rc;
-	if ((rc = get_config_file_write_handle (data))) {
+	if ((rc = get_config_rc ())) {
 		char buf[6];
 		sprintf(buf, "%d", preset->freq);
 
@@ -957,7 +958,7 @@
 write_config (XfcePanelPlugin *plugin, radio_gui *data)
 {
 	XfceRc *rc;
-	if ((rc = get_config_file_write_handle (data))) {
+	if ((rc = get_config_rc ())) {
 		xfce_rc_set_group	(rc, "radio plugin");
 
 		xfce_rc_write_entry	(rc, "dev", data->device);
@@ -989,18 +990,11 @@
 read_config (XfcePanelPlugin *plugin, radio_gui *data)
 {
 	const char *value;
-	char *file;
 	XfceRc *rc;
 
-	if (!(file = xfce_panel_plugin_lookup_rc_file (plugin)))
+	if (!(rc = get_config_rc (plugin)))
 		return;
 
-	rc = xfce_rc_simple_open (file, TRUE);
-	g_free (file);
-
-	if (!rc)
-		return;
-
 	xfce_rc_set_group (rc, "radio plugin");
 
 	data->freq = xfce_rc_read_int_entry (rc, "frq", FREQ_INIT);
@@ -1041,6 +1035,7 @@
 		}
 	}
 	g_strfreev (entries);
+	xfce_rc_close (rc);
 }
 
 static void

Modified: xfce4-radio-plugin/trunk/panel-plugin/radio.h
===================================================================
--- xfce4-radio-plugin/trunk/panel-plugin/radio.h	2008-09-19 18:19:14 UTC (rev 5423)
+++ xfce4-radio-plugin/trunk/panel-plugin/radio.h	2008-09-20 03:28:56 UTC (rev 5424)
@@ -41,6 +41,9 @@
 
 #define BORDER 8
 
+#define RADIO_CONFIG_FILE	"xfce4/panel/radio.rc"
+
+
 typedef enum {
 	CHANGE_FREQ,
 	CHANGE_PRESET