Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv1098/src
Modified Files:
file.c prefs.c prefs.h prefs_window.c
Log Message:
Moved mserv_use and mserv_username to new prefs.
Index: file.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file.c,v
retrieving revision 1.172
retrieving revision 1.173
diff -u -d -r1.172 -r1.173
--- file.c 11 Jun 2006 23:17:39 -0000 1.172
+++ file.c 12 Jun 2006 00:30:13 -0000 1.173
@@ -843,7 +843,7 @@
return FALSE;
}
- if (prefs_get_mserv_use())
+ if (prefs_get_int("mserv_use"))
{
/* try getting the user's rating from the mserv db */
gchar *music_root = prefs_get_string ("path_mserv_music_root");
@@ -871,14 +871,14 @@
{
/* printf("opened\n");*/
gchar buff[PATH_MAX];
- const gchar *username = prefs_get_mserv_username ();
+ gchar *username = prefs_get_string("mserv_username");
guint usernamelen;
g_return_val_if_fail (username, (fclose (fp), FALSE));
usernamelen = strlen (username);
while (fgets(buff, PATH_MAX, fp))
{
/* printf("username %s (%d) read %s\n",
- * prefs_get_mserv_username(), usernamelen,
+ * prefs_get_string("mserv_username"), usernamelen,
* buff);*/
if (strncmp(buff, username, usernamelen) == 0
&& buff[usernamelen] == (gchar)'=')
@@ -892,11 +892,15 @@
}
}
fclose(fp);
+ g_free(username);
if (!success)
{
- gchar *buf = g_strdup_printf (_("No information found for
user '%s' in '%s'"), prefs_get_mserv_username(), infoname);
+ gchar *username = prefs_get_string("mserv_username");
+ gchar *buf = g_strdup_printf (_("No information found for
user '%s' in '%s'"),
+ username, infoname);
display_mserv_problems (track, buf);
g_free (buf);
+ g_free(username);
}
}
else
@@ -1419,7 +1423,7 @@
if ((track == NULL) && str)
{
- if (prefs_get_mserv_use() &&
+ if (prefs_get_int("mserv_use") &&
prefs_get_int("mserv_report_probs") && str->len)
{ /* Some tracks have had problems. Print a notice */
buf = g_strdup_printf (
@@ -1453,7 +1457,7 @@
track_nr = 0;
gtkpod_tracks_statusbar_update();
}
- else if (prefs_get_mserv_use() &&
+ else if (prefs_get_int("mserv_use") &&
prefs_get_int("mserv_report_probs") && track)
{
/* add info about it to str */
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.225
retrieving revision 1.226
diff -u -d -r1.225 -r1.226
--- prefs.c 11 Jun 2006 23:17:40 -0000 1.225
+++ prefs.c 12 Jun 2006 00:30:13 -0000 1.226
@@ -222,6 +222,8 @@
prefs_set_string("parsetags_template", "%a - %A/%T %t.mp3;%t.wav");
prefs_set_int("coverart", TRUE);
prefs_set_string("coverart_template", "%A;folder.jpg");
+ prefs_set_int("mserv_use", FALSE);
+ prefs_set_string("mserv_username", "");
}
/* Initialize default variable-length list entries */
@@ -1804,8 +1806,6 @@
mycfg->sortcfg.tm_sortcol = TM_COLUMN_TITLE;
mycfg->sortcfg.tm_autostore = FALSE;
mycfg->sortcfg.case_sensitive = FALSE;
- mycfg->mserv_use = FALSE;
- mycfg->mserv_username = g_strdup ("");
g_free (cfgdir);
@@ -2120,15 +2120,6 @@
prefs_set_int (EXPORT_FILES_SPECIAL_CHARSET,
atoi (arg));
}
- else if(g_ascii_strcasecmp (line, "mserv_use") == 0)
- {
- prefs_set_mserv_use ((gboolean)atoi(arg));
- }
- else if(g_ascii_strcasecmp (line, "mserv_username") == 0)
- {
- prefs_set_mserv_username (arg);
- }
-
else
{ /* All leftover options will be stored into the prefs
setting hash (generic options -- should have had this
@@ -2303,7 +2294,6 @@
fprintf (fp, "info_window=%d\n", cfg->info_window);
fprintf (fp, "tmp_disable_sort=%d\n", cfg->tmp_disable_sort);
fprintf (fp, "startup_messages=%d\n", cfg->startup_messages);
- fprintf (fp, "mserv_use=%d\n", cfg->mserv_use);
}
@@ -2346,7 +2336,6 @@
if(c)
{
g_free (c->charset);
- g_free (c->mserv_username);
g_free (c);
}
}
@@ -2448,7 +2437,6 @@
{
result = g_memdup (cfg, sizeof (struct cfg));
result->charset = g_strdup(cfg->charset);
- result->mserv_username = g_strdup(cfg->mserv_username);
}
return(result);
}
@@ -2799,27 +2787,3 @@
return (prefs_get_block_display() || prefs_get_tmp_disable_sort());
}
-/* whether or not to read ratings from mserv db */
-gboolean prefs_get_mserv_use(void)
-{
- return(cfg->mserv_use);
-}
-
-void prefs_set_mserv_use(gboolean val)
-{
- cfg->mserv_use = val;
-}
-
-void prefs_set_mserv_username (const gchar *str)
-{
- if (str)
- {
- g_free (cfg->mserv_username);
- cfg->mserv_username = g_strdup (str);
- }
-}
-
-const gchar *prefs_get_mserv_username (void)
-{
- return cfg->mserv_username;
-}
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- prefs.h 11 Jun 2006 23:17:40 -0000 1.151
+++ prefs.h 12 Jun 2006 00:30:13 -0000 1.152
@@ -125,8 +125,6 @@
gboolean multi_edit_title; /* multi edit also enabled for title field? */
gboolean not_played_track; /* not played track in Highest rated
playlist?*/
gint misc_track_nr; /* track's nr in the Highest rated, most
played and most recently played pl*/
- gboolean mserv_use; /* use mserv data (rating)? */
- gchar *mserv_username; /* username for mserv? */
float version; /* version of gtkpod writing the cfg file */
};
@@ -334,10 +332,6 @@
gboolean prefs_get_tmp_disable_sort(void);
void prefs_set_startup_messages(gboolean val);
gboolean prefs_get_startup_messages(void);
-gboolean prefs_get_mserv_use(void);
-void prefs_set_mserv_use(gboolean val);
-const gchar *prefs_get_mserv_username(void);
-void prefs_set_mserv_username(const gchar *root);
gboolean prefs_get_disable_sorting(void);
#endif
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- prefs_window.c 11 Jun 2006 23:17:40 -0000 1.146
+++ prefs_window.c 12 Jun 2006 00:30:13 -0000 1.147
@@ -645,22 +645,16 @@
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_mserv_use");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpcfg->mserv_use);
+ prefs_get_int("mserv_use"));
w = gtkpod_xml_get_widget (prefs_window_xml, "cfg_mserv_report_probs");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_int("mserv_report_probs"));
w = gtkpod_xml_get_widget (prefs_window_xml, "mserv_username_entry");
- if (tmpcfg->mserv_username)
- { /* we should copy the new path first because by setting
- the text we might get a callback destroying the old
- value... */
- gchar *buf = g_strdup (tmpcfg->mserv_username);
- gtk_entry_set_text(GTK_ENTRY(w), buf);
- g_free (buf);
- }
-
+ buf = prefs_get_string("mserv_username");
+ gtk_entry_set_text(GTK_ENTRY(w), buf);
+ g_free(buf);
w = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
if (page == -1)
{
@@ -716,9 +710,6 @@
prefs_set_automount(tmpcfg->automount);
prefs_set_tmp_disable_sort(tmpcfg->tmp_disable_sort);
prefs_set_startup_messages(tmpcfg->startup_messages);
- prefs_set_mserv_use(tmpcfg->mserv_use);
- prefs_set_mserv_username(tmpcfg->mserv_username);
-
tm_show_preferred_columns();
}
}
@@ -845,21 +836,15 @@
prefs_window_apply (void)
{
gint defx, defy;
- GtkWidget *nb, *w;
+ GtkWidget *nb;
- /* Committ temp prefs to prefs table */
- temp_prefs_apply(temp_prefs);
- temp_lists_apply(temp_lists);
+ /* Committ temp prefs to prefs table */
+ temp_prefs_apply(temp_prefs);
+ temp_lists_apply(temp_lists);
/* save current settings */
prefs_window_set ();
- if((w = gtkpod_xml_get_widget (prefs_window_xml, "mserv_username_entry")))
- {
- gtk_entry_set_text(GTK_ENTRY(w), prefs_get_mserv_username ());
- /* tmpcfg gets set by the "changed" callback */
- }
-
/* save current notebook page */
nb = gtkpod_xml_get_widget (prefs_window_xml, "notebook");
prefs_set_last_prefs_page (gtk_notebook_get_current_page (
@@ -1402,7 +1387,8 @@
on_mserv_use_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
- tmpcfg->mserv_use = gtk_toggle_button_get_active (togglebutton);
+ temp_prefs_set_int(temp_prefs, "mserv_use",
+ gtk_toggle_button_get_active(togglebutton));
}
void
@@ -1420,8 +1406,8 @@
gchar *val = gtk_editable_get_chars (editable,0, -1);
if (!val) return;
- g_free (tmpcfg->mserv_username);
- tmpcfg->mserv_username = val;
+ temp_prefs_set_string(temp_prefs, "mserv_username", val);
+ g_free(val);
}
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
