Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15922/src
Modified Files:
display.h prefs.c prefs.h
Log Message:
* src/prefs.c
src/prefs.h:
src/misc.h: moved LIST_END_MARKER to prefs.c (private),
moved SORT_... enum to display.h
Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- display.h 10 Jun 2006 13:39:48 -0000 1.113
+++ display.h 15 Jun 2006 14:43:51 -0000 1.114
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-10 22:15:20 jcs>
+/* Time-stamp: <2006-06-15 23:31:30 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -45,6 +45,14 @@
/* pointer to main window */
extern GtkWidget *gtkpod_window;
+/* types for sort */
+enum
+{
+ SORT_ASCENDING = GTK_SORT_ASCENDING,
+ SORT_DESCENDING = GTK_SORT_DESCENDING,
+ SORT_NONE = 10*(GTK_SORT_ASCENDING+GTK_SORT_DESCENDING),
+};
+
/* Categories in each sort tab (page numbers) */
typedef enum {
ST_CAT_ARTIST = 0,
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.246
retrieving revision 1.247
diff -u -d -r1.246 -r1.247
--- prefs.c 15 Jun 2006 03:07:30 -0000 1.246
+++ prefs.c 15 Jun 2006 14:43:51 -0000 1.247
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-13 23:52:53 jcs>
+/* Time-stamp: <2006-06-15 23:32:55 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -110,6 +110,9 @@
* Data global to this module only
*/
+/* End-of-list marker for variable-length lists */
+#define LIST_END_MARKER "----++++----"
+
struct sub_data
{
TempPrefs *temp_prefs;
@@ -687,21 +690,6 @@
}
}
-/* sort order was reversed between V0.82_CVS and V0.83.CVS */
-static gint correct_sort (gint sort)
-{
- switch (sort)
- {
- case SORT_ASCENDING:
- sort = SORT_DESCENDING;
- break;
- case SORT_DESCENDING:
- sort = SORT_ASCENDING;
- break;
- }
- return sort;
-}
-
/* Delete and rename keys */
static void cleanup_keys()
{
@@ -709,7 +697,6 @@
gint int_buf;
gint i;
gint x, y, p; /* Window position */
- gint sort; /* sort order */
float version=0;
/* get version */
@@ -1008,19 +995,6 @@
prefs_set_string("sm_sort_", NULL);
}
- /* Correct sort order */
- sort = prefs_get_int("st_sort");
- sort = correct_sort(sort);
- prefs_set_int("st_sort", sort);
-
- sort = prefs_get_int("pm_sort");
- sort = correct_sort(sort);
- prefs_set_int("pm_sort", sort);
-
- sort = prefs_get_int("tm_sort");
- sort = correct_sort(sort);
- prefs_set_int("tm_sort_", sort);
-
prefs_set_string ("version", VERSION);
}
Index: prefs.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.h,v
retrieving revision 1.174
retrieving revision 1.175
diff -u -d -r1.174 -r1.175
--- prefs.h 15 Jun 2006 03:07:30 -0000 1.174
+++ prefs.h 15 Jun 2006 14:43:51 -0000 1.175
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-15 00:55:28 jcs>
+/* Time-stamp: <2006-06-15 23:31:30 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -40,9 +40,6 @@
-/* End-of-list marker for variable-length lists */
-#define LIST_END_MARKER "----++++----"
-
/* Not sure where to put these (maybe prefkeys.h?): prefs keys used */
/* repository.c */
extern const gchar *KEY_CONCAL_AUTOSYNC;
@@ -79,14 +76,6 @@
};
-/* types for sort */
-enum
-{
- SORT_ASCENDING = GTK_SORT_ASCENDING,
- SORT_DESCENDING = GTK_SORT_DESCENDING,
- SORT_NONE = 10*(GTK_SORT_ASCENDING+GTK_SORT_DESCENDING),
-};
-
/* New prefs backend. Will replace the stuff above */
/*
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
