Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv17630/src
Modified Files:
display.c display.h display_private.h display_sorttabs.c
Log Message:
* display.c (display_create): removed reference to stop_button
* src/display.c
src/display.h
src/display_private.h
src/display_sorttabs.c:
sorted out remaining assertions produced after last night's
changes. Made st_page_selected() and st_create_notebook()
static.
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.153
retrieving revision 1.154
diff -u -d -r1.153 -r1.154
--- display.c 18 Mar 2007 14:27:18 -0000 1.153
+++ display.c 19 Mar 2007 14:46:07 -0000 1.154
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-03-18 23:17:19 jcs>
+/* Time-stamp: <2007-03-19 23:13:41 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -51,7 +51,6 @@
/* Create the listviews etc */
void display_create (void)
{
- GtkWidget *stop_button;
gint defx, defy;
GtkTooltips *main_tooltips;
@@ -77,9 +76,6 @@
st_create_tabs ();
st_set_default_sizes ();
pm_create_treeview ();
- /* Hide the "stop_button" */
- stop_button = gtkpod_xml_get_widget (main_window_xml, "stop_button");
- if (stop_button) gtk_widget_hide (stop_button);
/* Hide/Show the toolbar */
display_show_hide_toolbar ();
/* Hide/Show tooltips */
Index: display.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.h,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- display.h 18 Mar 2007 14:27:18 -0000 1.121
+++ display.h 19 Mar 2007 14:46:08 -0000 1.122
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-03-18 22:42:37 jcs>
+/* Time-stamp: <2007-03-19 23:00:45 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -305,7 +305,6 @@
Playlist *playlist);
void st_stop_editing (gint inst, gboolean cancel);
-void st_page_selected (GtkNotebook *notebook, guint page);
gboolean st_set_selection (Itdb_Track *track);
void st_redisplay (guint32 inst);
void st_sort (GtkSortType order);
Index: display_private.h
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_private.h,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- display_private.h 18 Mar 2007 14:27:18 -0000 1.26
+++ display_private.h 19 Mar 2007 14:46:08 -0000 1.27
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-03-18 23:04:55 jcs>
+/* Time-stamp: <2007-03-19 23:11:13 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -71,7 +71,6 @@
void st_create_tabs (void);
void st_remove_track (Track *track, guint32 inst);
void st_init (ST_CAT_item new_category, guint32 inst);
-void st_create_notebook (gint inst);
void st_cleanup (void);
void st_set_default_sizes (void);
void st_update_default_sizes (void);
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -d -r1.89 -r1.90
--- display_sorttabs.c 18 Mar 2007 14:27:18 -0000 1.89
+++ display_sorttabs.c 19 Mar 2007 14:46:08 -0000 1.90
@@ -1,4 +1,4 @@
-/* Time-stamp: <2007-03-18 23:14:37 jcs>
+/* Time-stamp: <2007-03-19 23:29:07 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -51,6 +51,8 @@
/* compare function to be used for string comparisons */
static void sp_store_sp_entries (gint inst);
+static void st_page_selected (GtkNotebook *notebook, guint page);
+static void st_create_notebook (gint inst);
/* Drag and drop definitions */
static GtkTargetEntry st_drag_types [] = {
@@ -267,6 +269,8 @@
gchar *buf;
guint inst = GPOINTER_TO_UINT( user_data );
+
+
/* printf ("switch_page: inst/page: %d/%d\n", inst, page_num); */
/* set compare function for strings (to speed up sorting) */
if (page_num != ST_CAT_SPECIAL)
@@ -1883,7 +1887,7 @@
/* Called when page in sort tab is selected */
-void st_page_selected (GtkNotebook *notebook, guint page)
+static void st_page_selected (GtkNotebook *notebook, guint page)
{
guint32 inst;
@@ -2503,8 +2507,8 @@
/* Make the appropriate number of sort tab instances visible */
/* Also: make the menu items "more/less sort tabs" active/inactive as
- * needed */
-void st_show_visible (void)
+ * needed. */
+static void st_adjust_visible (void)
{
gint i,n;
GtkWidget *w;
@@ -2539,6 +2543,15 @@
w = gtkpod_xml_get_widget (main_window_xml, "more_sort_tabs");
if (n == SORT_TAB_MAX) gtk_widget_set_sensitive (w, FALSE);
else gtk_widget_set_sensitive (w, TRUE);
+}
+
+/* Make the appropriate number of sort tab instances visible */
+/* Also: make the menu items "more/less sort tabs" active/inactive as
+ * needed. */
+void st_show_visible (void)
+{
+ /* Adjust visibility */
+ st_adjust_visible ();
/* redisplay */
st_redisplay (0);
@@ -3002,7 +3015,7 @@
/* Create notebook and fill in [EMAIL PROTECTED] */
-void st_create_notebook (gint inst)
+static void st_create_notebook (gint inst)
{
GtkWidget *st0_notebook;
GtkPaned *paned;
@@ -3036,9 +3049,6 @@
else
gtk_paned_pack1 (paned, st0_notebook, FALSE, TRUE);
gtk_notebook_set_scrollable (GTK_NOTEBOOK (st0_notebook), TRUE);
- g_signal_connect ((gpointer) st0_notebook, "switch_page",
- G_CALLBACK (on_st_switch_page),
- GINT_TO_POINTER(inst));
st->notebook = GTK_NOTEBOOK (st0_notebook);
st_create_pages (inst);
@@ -3047,6 +3057,10 @@
gtk_notebook_set_current_page (st->notebook, page);
if (prefs_get_int("st_sort") != SORT_NONE)
st_sort_inst (inst, prefs_get_int("st_sort"));
+
+ g_signal_connect ((gpointer) st0_notebook, "switch_page",
+ G_CALLBACK (on_st_switch_page),
+ GINT_TO_POINTER(inst));
}
@@ -3064,7 +3078,10 @@
sorttab[inst]->string_compare_func = compare_string;
st_create_notebook (inst);
}
- st_show_visible ();
+ /* adjust number of visible sorttabs (cannot use st_show_visible()
+ because the latter calls st_redisplay(0) which refers to the
+ playlist view which hasn't yet set up) */
+ st_adjust_visible ();
}
/* Clean up the memory used by sort tabs (program quit). */
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys-and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
