Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7875/src
Modified Files:
display.c display.h display_playlists.c prefs.c prefs.h
prefs_window.c
Log Message:
* src/prefs.[ch]
src/prefs_window.c
src/display.[ch]
src/display_playlists.c
Did away with pm_autostore.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.139
retrieving revision 1.140
diff -u -d -r1.139 -r1.140
--- display.c 8 Jun 2006 23:15:46 -0000 1.139
+++ display.c 10 Jun 2006 13:39:48 -0000 1.140
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-21 12:42:41 jcs>
+/* Time-stamp: <2006-06-10 22:15:20 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1242,7 +1242,6 @@
gpointer user_data)
{
tm_rows_reordered ();
- pm_rows_reordered ();
}
Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.112
retrieving revision 1.113
diff -u -d -r1.112 -r1.113
--- display.h 28 May 2006 15:49:47 -0000 1.112
+++ display.h 10 Jun 2006 13:39:48 -0000 1.113
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-28 23:20:47 jcs>
+/* Time-stamp: <2006-06-10 22:15:20 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -309,7 +309,6 @@
void tm_add_track_to_track_model (Track *track, GtkTreeIter *into_iter);
guint tm_get_nr_of_tracks(void);
void tm_rows_reordered(void);
-void pm_rows_reordered(void);
gboolean tm_add_filelist (gchar *data, GtkTreePath *path,
GtkTreeViewDropPosition pos);
void tm_stop_editing (gboolean cancel);
Index: display_playlists.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_playlists.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- display_playlists.c 8 Jun 2006 06:10:46 -0000 1.84
+++ display_playlists.c 10 Jun 2006 13:39:48 -0000 1.85
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-28 12:59:38 jcs>
+/* Time-stamp: <2006-06-10 22:15:19 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -880,6 +880,7 @@
gtk_drag_finish (dc, FALSE, FALSE, time);
g_return_if_reached ();
}
+ pm_rows_reordered ();
return;
}
else
@@ -934,6 +935,7 @@
}
}
+ pm_rows_reordered ();
break;
default:
gtkpod_warning (_("This DND type (%d) is not (yet) supported. If you
feel implementing this would be useful, please contact the author.\n\n"), info);
@@ -1584,7 +1586,7 @@
else
{
prefs_set_pm_sort (gtk_tree_view_column_get_sort_order (tvc));
- if (prefs_get_pm_autostore ()) pm_rows_reordered ();
+ pm_rows_reordered ();
}
}
#endif
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- prefs.c 10 Jun 2006 08:29:43 -0000 1.215
+++ prefs.c 10 Jun 2006 13:39:48 -0000 1.216
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-10 12:12:25 jcs>
+/* Time-stamp: <2006-06-10 20:19:32 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1794,7 +1794,6 @@
mycfg->sortcfg.st_sort = SORT_NONE;
mycfg->sortcfg.tm_sort = SORT_NONE;
mycfg->sortcfg.tm_sortcol = TM_COLUMN_TITLE;
- mycfg->sortcfg.pm_autostore = FALSE;
mycfg->sortcfg.tm_autostore = FALSE;
mycfg->sortcfg.case_sensitive = FALSE;
mycfg->mserv_use = FALSE;
@@ -2007,7 +2006,7 @@
}
else if(g_ascii_strcasecmp (line, "pm_autostore") == 0)
{
- prefs_set_pm_autostore((gboolean)atoi(arg));
+ /* ignore */
}
else if((g_ascii_strcasecmp (line, "tm_autostore") == 0) ||
(g_ascii_strcasecmp (line, "sm_autostore") == 0))
@@ -2317,7 +2316,6 @@
fprintf(fp, "extended_info=%d\n",prefs_get_write_extended_info());
fprintf(fp, "display_toolbar=%d\n",prefs_get_display_toolbar());
fprintf(fp, "toolbar_style=%d\n",prefs_get_toolbar_style());
- fprintf(fp, "pm_autostore=%d\n",prefs_get_pm_autostore());
fprintf(fp, "tm_autostore=%d\n",prefs_get_tm_autostore());
fprintf(fp, "pm_sort=%d\n",prefs_get_pm_sort());
fprintf(fp, "st_sort=%d\n",prefs_get_st_sort());
@@ -2729,16 +2727,6 @@
display_show_hide_toolbar ();
}
-gboolean prefs_get_pm_autostore (void)
-{
- return cfg->sortcfg.pm_autostore;
-}
-
-void prefs_set_pm_autostore (gboolean val)
-{
- cfg->sortcfg.pm_autostore = val;
-}
-
gboolean prefs_get_tm_autostore (void)
{
return cfg->sortcfg.tm_autostore;
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- prefs.h 10 Jun 2006 08:29:43 -0000 1.140
+++ prefs.h 10 Jun 2006 13:39:48 -0000 1.141
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-25 00:56:55 jcs>
+/* Time-stamp: <2006-06-10 20:17:34 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -105,7 +105,6 @@
gint st_sort; /* sort type for sort tabs */
gint tm_sort; /* sort type for tracks */
TM_item tm_sortcol; /* sort column for tracks */
- gboolean pm_autostore; /* save sort order automatically? */
gboolean tm_autostore; /* save sort order automatically? */
gboolean case_sensitive; /* Should sorting be case-sensitive? */
GList *tmp_sort_ign_fields; /* used in prefs_window.c only */
@@ -294,7 +293,6 @@
void prefs_set_st_sort (gint type);
void prefs_set_tm_sortcol (TM_item col);
void prefs_set_tm_autostore (gboolean active);
-void prefs_set_pm_autostore (gboolean active);
void prefs_set_write_extended_info(gboolean active);
void prefs_set_autoimport(gboolean val);
void prefs_set_md5tracks(gboolean active);
@@ -323,7 +321,6 @@
gint prefs_get_tm_sort (void);
TM_item prefs_get_tm_sortcol (void);
gboolean prefs_get_tm_autostore (void);
-gboolean prefs_get_pm_autostore (void);
gboolean prefs_get_write_extended_info(void);
gboolean prefs_get_autoimport(void);
gchar * prefs_get_charset (void);
Index: prefs_window.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs_window.c,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -d -r1.137 -r1.138
--- prefs_window.c 10 Jun 2006 08:29:43 -0000 1.137
+++ prefs_window.c 10 Jun 2006 13:39:48 -0000 1.138
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-05-22 23:24:27 jcs>
+/* Time-stamp: <2006-06-10 20:19:45 jcs>
|
| Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -1697,11 +1697,6 @@
if (w)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
- w = gtkpod_xml_get_widget (sort_window_xml, "pm_autostore");
- if (w)
- gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
- tmpsortcfg->pm_autostore);
-
w = gtkpod_xml_get_widget (sort_window_xml, "tm_autostore");
if (w)
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -1795,7 +1790,6 @@
tsc = clone_sortprefs ();
prefs_set_pm_sort (scfg->pm_sort);
- prefs_set_pm_autostore (scfg->pm_autostore);
prefs_set_st_sort (scfg->st_sort);
prefs_set_tm_sort (scfg->tm_sort);
prefs_set_tm_autostore (scfg->tm_autostore);
@@ -1871,8 +1865,6 @@
tm_sort (prefs_get_tm_sortcol (), scfg->tm_sort);
}
/* if auto sort was changed to TRUE, store order */
- if (!tsc->pm_autostore && scfg->pm_autostore)
- pm_rows_reordered ();
if (!tsc->tm_autostore && scfg->tm_autostore)
tm_rows_reordered ();
@@ -1941,15 +1933,6 @@
void
-on_pm_autostore_toggled (GtkToggleButton *togglebutton,
- gpointer user_data)
-{
- sort_window_set_pm_autostore (gtk_toggle_button_get_active(togglebutton));
-}
-
-
-
-void
on_tm_ascend_toggled (GtkToggleButton *togglebutton,
gpointer user_data)
{
@@ -2119,11 +2102,6 @@
sort_window_set (tmpsortcfg);
}
-void sort_window_set_pm_autostore (gboolean val)
-{
- tmpsortcfg->pm_autostore = val;
-}
-
void sort_window_set_tm_autostore (gboolean val)
{
tmpsortcfg->tm_autostore = val;
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
