Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7194/src
Modified Files:
display_songs.c display_sorttabs.c misc.c misc.h
Log Message:
Renamed disable_sorting to sorting disabled to avoid confusion.
Index: display_songs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_songs.c,v
retrieving revision 1.109
retrieving revision 1.110
diff -u -d -r1.109 -r1.110
--- display_songs.c 20 Jun 2006 02:32:29 -0000 1.109
+++ display_songs.c 20 Jun 2006 23:13:35 -0000 1.110
@@ -2275,7 +2275,7 @@
if (disable_count == 0 && track_treeview)
{
if ((prefs_get_int("tm_sort_") != SORT_NONE) &&
- disable_sorting())
+ sorting_disabled())
{
/* Re-enable sorting */
GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
@@ -2301,7 +2301,7 @@
if (disable_count == 0 && track_treeview)
{
if ((prefs_get_int("tm_sort_") != SORT_NONE) &&
- disable_sorting ())
+ sorting_disabled ())
{
/* Disable sorting */
GtkTreeModel *model = gtk_tree_view_get_model (track_treeview);
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.84
retrieving revision 1.85
diff -u -d -r1.84 -r1.85
--- display_sorttabs.c 20 Jun 2006 04:44:57 -0000 1.84
+++ display_sorttabs.c 20 Jun 2006 23:13:35 -0000 1.85
@@ -2435,7 +2435,7 @@
{
/* Re-enable sorting */
if ((prefs_get_int("st_sort") != SORT_NONE) &&
- disable_sorting ())
+ sorting_disabled ())
{
SortTab *st = sorttab[inst];
if (st &&
@@ -2467,7 +2467,7 @@
{
/* Disable sorting */
if ((prefs_get_int("st_sort") != SORT_NONE) &&
- disable_sorting ())
+ sorting_disabled ())
{
SortTab *st = sorttab[inst];
if (st &&
Index: misc.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc.c,v
retrieving revision 1.207
retrieving revision 1.208
diff -u -d -r1.207 -r1.208
--- misc.c 20 Jun 2006 04:44:57 -0000 1.207
+++ misc.c 20 Jun 2006 23:13:35 -0000 1.208
@@ -1575,7 +1575,7 @@
/* Sorting gets disabled if either tmp disable sort or
* block display are true */
-gboolean disable_sorting()
+gboolean sorting_disabled()
{
return (prefs_get_int("block_display") ||
prefs_get_int("tmp_disable_sort"));
Index: misc.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc.h,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- misc.h 20 Jun 2006 02:32:29 -0000 1.116
+++ misc.h 20 Jun 2006 23:13:35 -0000 1.117
@@ -249,5 +249,5 @@
void set_itdb_prefs_int (iTunesDB *itdb, const gchar *subkey, gint value);
void set_itdb_index_prefs_int (gint index,
const gchar *subkey, gint value);
-gboolean disable_sorting();
+gboolean sorting_disabled();
#endif
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
