Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9337/src
Modified Files:
confirmation.c context_menus.c display.c display_playlists.c
display_songs.c display_sorttabs.c display_spl.c file_export.c
info.c main.c misc.c misc_input.c podcast.c prefs.c
Log Message:
* globally changed glade_xml_get_widget() to
gtkpod_xml_get_widget()
Index: confirmation.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/confirmation.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- confirmation.c 18 Oct 2005 14:29:55 -0000 1.22
+++ confirmation.c 26 Nov 2005 13:44:41 -0000 1.23
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-10-18 23:23:44 jcs>
+/* Time-stamp: <2005-11-25 23:52:15 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -292,7 +292,7 @@
{ /* window with same ID already open -- add @text and return
* */
if (text && *text &&
- cd->window && ((w = glade_xml_get_widget (cd->window_xml,
"text"))))
+ cd->window && ((w = gtkpod_xml_get_widget (cd->window_xml,
"text"))))
{
GtkTextIter ti;
GtkTextBuffer *tb = gtk_text_view_get_buffer(GTK_TEXT_VIEW(w));
@@ -303,7 +303,7 @@
gtk_text_view_set_buffer(GTK_TEXT_VIEW(w), tb);
gtk_text_view_set_editable(GTK_TEXT_VIEW(w), FALSE);
gtk_text_view_set_cursor_visible(GTK_TEXT_VIEW(w), FALSE);
- if ((w1 = glade_xml_get_widget (cd->window_xml,
"scroller")))
+ if ((w1 = gtkpod_xml_get_widget (cd->window_xml,
"scroller")))
gtk_widget_show (w1);
cd->scrolled = TRUE;
}
@@ -338,7 +338,7 @@
/* window = create_confirm_dialog (); */
confirm_xml = glade_xml_new (xml_file, "confirm_dialog", NULL);
- window = glade_xml_get_widget (confirm_xml, "confirm_dialog");
+ window = gtkpod_xml_get_widget (confirm_xml, "confirm_dialog");
/* insert ID into hash table */
cd = g_malloc (sizeof (ConfData));
@@ -361,11 +361,11 @@
gtk_window_set_title (GTK_WINDOW(window), _("Confirmation Dialogue"));
/* Set label */
- if (label && (w = glade_xml_get_widget (confirm_xml, "label")))
+ if (label && (w = gtkpod_xml_get_widget (confirm_xml, "label")))
gtk_label_set_text(GTK_LABEL(w), label);
/* Set text */
- w = glade_xml_get_widget (confirm_xml, "text");
+ w = gtkpod_xml_get_widget (confirm_xml, "text");
if (text)
{
if (w)
@@ -381,7 +381,7 @@
}
else
{ /* no text -> hide widget */
- if ((w = glade_xml_get_widget (confirm_xml, "scroller")))
+ if ((w = gtkpod_xml_get_widget (confirm_xml, "scroller")))
gtk_widget_hide (w);
cd->scrolled = FALSE;
prefs_get_size_conf (&defx, &defy);
@@ -389,7 +389,7 @@
gtk_window_set_default_size (GTK_WINDOW (window), defx, defy);
/* Set "Option 1" checkbox */
- w = glade_xml_get_widget (confirm_xml, "option_vbox");
+ w = gtkpod_xml_get_widget (confirm_xml, "option_vbox");
if (w && option1_handler && option1_text)
{
gboolean state, invert;
@@ -415,7 +415,7 @@
}
/* Set "Option 2" checkbox */
- w = glade_xml_get_widget (confirm_xml, "option_vbox");
+ w = gtkpod_xml_get_widget (confirm_xml, "option_vbox");
if (w && option2_handler && option2_text)
{
gboolean state, invert;
@@ -441,7 +441,7 @@
}
/* Set "Never Again" checkbox */
- w = glade_xml_get_widget (confirm_xml, "never_again");
+ w = gtkpod_xml_get_widget (confirm_xml, "never_again");
if (w && confirm_again_handler)
{ /* connect signal */
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
@@ -459,7 +459,7 @@
/* Hide and set "default" button that can be activated by pressing
ENTER in the window (usually OK)*/
/* Hide or default CANCEL button */
- if ((w = glade_xml_get_widget (confirm_xml, "cancel")))
+ if ((w = gtkpod_xml_get_widget (confirm_xml, "cancel")))
{
GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);
gtk_widget_grab_default (w);
@@ -467,7 +467,7 @@
}
/* Hide or default APPLY button */
- if ((w = glade_xml_get_widget (confirm_xml, "apply")))
+ if ((w = gtkpod_xml_get_widget (confirm_xml, "apply")))
{
GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);
gtk_widget_grab_default (w);
@@ -475,7 +475,7 @@
}
/* Hide or default OK button */
- if ((w = glade_xml_get_widget (confirm_xml, "ok")))
+ if ((w = gtkpod_xml_get_widget (confirm_xml, "ok")))
{
GTK_WIDGET_SET_FLAGS (w, GTK_CAN_DEFAULT);
gtk_widget_grab_default (w);
Index: context_menus.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/context_menus.c,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- context_menus.c 24 Nov 2005 15:37:07 -0000 1.48
+++ context_menus.c 26 Nov 2005 13:44:41 -0000 1.49
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-24 20:52:04 jcs>
+/* Time-stamp: <2005-11-26 22:41:24 jcs>
|
| Copyright (C) 2003 Corey Donohoe <atmos at atmos dot org>
| Copyright (C) 2003-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -80,13 +80,9 @@
GList *gl2;
for (gl2=tr->thumbnails; gl2; gl2=gl2->next)
{
- guchar *chardata;
Image *img = gl2->data;
g_return_if_fail (img);
- printf (" %s offset: %d\n", img->filename, img->offset);
- chardata = itdb_image_get_rgb_data (tr->itdb, img);
- if (chardata) printf ("%s\n", chardata);
- g_free (chardata);
+ printf (" %s offset: %d size: %d width: %d height: %d\n",
img->filename, img->offset, img->size, img->width, img->height);
}
}
}
Index: display.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display.c,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -d -r1.122 -r1.123
--- display.c 12 Nov 2005 08:54:31 -0000 1.122
+++ display.c 26 Nov 2005 13:44:41 -0000 1.123
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 17:41:37 jcs>
+/* Time-stamp: <2005-11-25 23:52:14 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -76,7 +76,7 @@
st_set_default_sizes ();
pm_create_treeview ();
/* Hide the "stop_button" */
- stop_button = glade_xml_get_widget (main_window_xml, "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 ();
@@ -159,7 +159,7 @@
g_return_if_fail (gtkpod_window);
- if((w = glade_xml_get_widget (main_window_xml, "import_button")))
+ if((w = gtkpod_xml_get_widget (main_window_xml, "import_button")))
{
gtk_widget_set_sensitive(w, FALSE);
/* in case this widget has been blocked, we need to tell
@@ -167,7 +167,7 @@
update_blocked_widget (w, FALSE);
}
- if((w = glade_xml_get_widget (main_window_xml, "import_itunes_mi")))
+ if((w = gtkpod_xml_get_widget (main_window_xml, "import_itunes_mi")))
{
gtk_widget_set_sensitive(w, FALSE);
/* in case this widget has been blocked, we need to tell
@@ -180,17 +180,17 @@
/* make sure only suitable delete menu items are available */
void display_adjust_delete_menus (void)
{
- GtkWidget *d = glade_xml_get_widget (main_window_xml, "delete_menu");
- GtkWidget *dp = glade_xml_get_widget (main_window_xml,
"delete_playlist_menu");
- GtkWidget *df = glade_xml_get_widget (main_window_xml,
"delete_full_menu");
- GtkWidget *dfp = glade_xml_get_widget (main_window_xml,
"delete_full_playlist_menu");
+ GtkWidget *d = gtkpod_xml_get_widget (main_window_xml, "delete_menu");
+ GtkWidget *dp = gtkpod_xml_get_widget (main_window_xml,
"delete_playlist_menu");
+ GtkWidget *df = gtkpod_xml_get_widget (main_window_xml,
"delete_full_menu");
+ GtkWidget *dfp = gtkpod_xml_get_widget (main_window_xml,
"delete_full_playlist_menu");
#if 0
/* not used */
- GtkWidget *de = glade_xml_get_widget (main_window_xml,
"delete_tab_entry_menu");
- GtkWidget *dt = glade_xml_get_widget (main_window_xml,
"delete_tracks_menu");
- GtkWidget *dfe = glade_xml_get_widget (main_window_xml,
+ GtkWidget *de = gtkpod_xml_get_widget (main_window_xml,
"delete_tab_entry_menu");
+ GtkWidget *dt = gtkpod_xml_get_widget (main_window_xml,
"delete_tracks_menu");
+ GtkWidget *dfe = gtkpod_xml_get_widget (main_window_xml,
"delete_full_tab_entry_menu");
- GtkWidget *dft = glade_xml_get_widget (main_window_xml,
"delete_full_tracks_menu");
+ GtkWidget *dft = gtkpod_xml_get_widget (main_window_xml,
"delete_full_tracks_menu");
#endif
Playlist *pl = pm_get_selected_playlist ();
@@ -232,8 +232,8 @@
the prefs */
void display_show_hide_toolbar (void)
{
- GtkWidget *tb = glade_xml_get_widget (main_window_xml, "toolbar");
- GtkWidget *mi = glade_xml_get_widget (main_window_xml, "toolbar_menu");
+ GtkWidget *tb = gtkpod_xml_get_widget (main_window_xml, "toolbar");
+ GtkWidget *mi = gtkpod_xml_get_widget (main_window_xml, "toolbar_menu");
if (prefs_get_display_toolbar ())
{
@@ -252,7 +252,7 @@
prefs. */
void display_set_info_window_menu (void)
{
- GtkWidget *mi = glade_xml_get_widget (main_window_xml, "info_window_menu");
+ GtkWidget *mi = gtkpod_xml_get_widget (main_window_xml,
"info_window_menu");
if (prefs_get_info_window ())
{
@@ -271,7 +271,7 @@
{
GtkWidget *w = NULL;
- if((w = glade_xml_get_widget (main_window_xml, "check_ipod_files_mi")))
+ if((w = gtkpod_xml_get_widget (main_window_xml, "check_ipod_files_mi")))
gtk_widget_set_sensitive(w, !prefs_get_offline());
}
@@ -292,8 +292,8 @@
"main_tooltips_initialised")) return;
mi = GTK_CHECK_MENU_ITEM (
- glade_xml_get_widget (main_window_xml, "tooltips_menu"));
- tb = GTK_TOOLBAR (glade_xml_get_widget (main_window_xml, "toolbar"));
+ gtkpod_xml_get_widget (main_window_xml, "tooltips_menu"));
+ tb = GTK_TOOLBAR (gtkpod_xml_get_widget (main_window_xml, "toolbar"));
mt = g_object_get_data (G_OBJECT (gtkpod_window), "main_tooltips");
g_return_if_fail (mi);
@@ -452,7 +452,7 @@
/* lookup stop_button */
if (stop_button == NULL)
{
- stop_button = glade_xml_get_widget (main_window_xml, "stop_button");
+ stop_button = gtkpod_xml_get_widget (main_window_xml, "stop_button");
if (stop_button == NULL)
g_warning ("Programming error: stop_button not found\n");
}
Index: display_playlists.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_playlists.c,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- display_playlists.c 25 Nov 2005 14:12:05 -0000 1.69
+++ display_playlists.c 26 Nov 2005 13:44:41 -0000 1.70
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-25 21:33:12 jcs>
+/* Time-stamp: <2005-11-25 23:52:14 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1897,7 +1897,7 @@
GtkWidget *playlist_window;
GtkWidget *tree;
- playlist_window = glade_xml_get_widget (main_window_xml, "playlist_window");
+ playlist_window = gtkpod_xml_get_widget (main_window_xml, "playlist_window");
g_return_if_fail (playlist_window);
/* destroy old treeview */
Index: display_songs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_songs.c,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -d -r1.92 -r1.93
--- display_songs.c 23 Nov 2005 04:16:12 -0000 1.92
+++ display_songs.c 26 Nov 2005 13:44:41 -0000 1.93
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-21 00:39:50 jcs>
+/* Time-stamp: <2005-11-25 23:52:14 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -2173,7 +2173,7 @@
void tm_create_treeview (void)
{
GtkTreeModel *model = NULL;
- GtkWidget *track_window = glade_xml_get_widget (main_window_xml,
"track_window");
+ GtkWidget *track_window = gtkpod_xml_get_widget (main_window_xml,
"track_window");
GtkTreeSelection *select;
gint col;
GtkWidget *stv = gtk_tree_view_new ();
Index: display_sorttabs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_sorttabs.c,v
retrieving revision 1.64
retrieving revision 1.65
diff -u -d -r1.64 -r1.65
--- display_sorttabs.c 25 Nov 2005 14:12:05 -0000 1.64
+++ display_sorttabs.c 26 Nov 2005 13:44:41 -0000 1.65
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-21 20:52:10 jcs>
+/* Time-stamp: <2005-11-25 23:52:13 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -2460,12 +2460,12 @@
}
/* activate / deactiveate "less sort tabs" menu item */
- w = glade_xml_get_widget (main_window_xml, "less_sort_tabs");
+ w = gtkpod_xml_get_widget (main_window_xml, "less_sort_tabs");
if (n == 0) gtk_widget_set_sensitive (w, FALSE);
else gtk_widget_set_sensitive (w, TRUE);
/* activate / deactiveate "more sort tabs" menu item */
- w = glade_xml_get_widget (main_window_xml, "more_sort_tabs");
+ 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);
@@ -2489,7 +2489,7 @@
gtk_window_get_size (GTK_WINDOW (gtkpod_window), &x, &y);
buf = g_strdup_printf ("paned%d", PANED_PLAYLIST);
- if((w = glade_xml_get_widget (main_window_xml, buf)))
+ if((w = gtkpod_xml_get_widget (main_window_xml, buf)))
{
p0 = gtk_paned_get_position (GTK_PANED (w));
width = (x-p0) / num;
@@ -2544,8 +2544,8 @@
{
GtkWidget *parent;
GtkWidget *dummy;
- parent = glade_xml_get_widget (main_window_xml, "paned1");
- dummy = glade_xml_get_widget (main_window_xml, "paned1_dummy");
+ parent = gtkpod_xml_get_widget (main_window_xml, "paned1");
+ dummy = gtkpod_xml_get_widget (main_window_xml, "paned1_dummy");
g_return_if_fail (parent);
g_return_if_fail (dummy);
gtk_widget_destroy (dummy);
@@ -2652,9 +2652,9 @@
GladeXML *special_xml;
special_xml = glade_xml_new (xml_file, "special_sorttab", NULL);
- special = glade_xml_get_widget (special_xml, "special_sorttab");
+ special = gtkpod_xml_get_widget (special_xml, "special_sorttab");
- viewport = glade_xml_get_widget (special_xml, "special_viewport");
+ viewport = gtkpod_xml_get_widget (special_xml, "special_viewport");
/* according to GTK FAQ: move a widget to a new parent */
@@ -2666,7 +2666,7 @@
/* Connect the signal handlers and set default value. User data
is @inst+(additional data << SP_SHIFT) */
/* AND/OR button */
- w = glade_xml_get_widget (special_xml, "sp_or_button");
+ w = gtkpod_xml_get_widget (special_xml, "sp_or_button");
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_or_button_toggled),
GINT_TO_POINTER(inst));
@@ -2674,12 +2674,12 @@
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
else
{
- w = glade_xml_get_widget (special_xml, "sp_and_button");
+ w = gtkpod_xml_get_widget (special_xml, "sp_and_button");
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w), TRUE);
}
/* RATING */
- w = glade_xml_get_widget (special_xml, "sp_rating_button");
+ w = gtkpod_xml_get_widget (special_xml, "sp_rating_button");
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_cond_button_toggled),
GUINT_TO_POINTER((T_RATING<<SP_SHIFT) + inst));
@@ -2688,7 +2688,7 @@
for (i=0; i<=RATING_MAX; ++i)
{
gchar *buf = g_strdup_printf ("sp_rating%d", i);
- w = glade_xml_get_widget (special_xml, buf);
+ w = gtkpod_xml_get_widget (special_xml, buf);
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_rating_n_toggled),
GUINT_TO_POINTER((i<<SP_SHIFT) + inst));
@@ -2698,20 +2698,20 @@
}
/* PLAYCOUNT */
- w = glade_xml_get_widget (special_xml, "sp_playcount_button");
+ w = gtkpod_xml_get_widget (special_xml, "sp_playcount_button");
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_cond_button_toggled),
GUINT_TO_POINTER((T_PLAYCOUNT<<SP_SHIFT) + inst));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_sp_cond (inst, T_PLAYCOUNT));
- w = glade_xml_get_widget (special_xml, "sp_playcount_low");
+ w = gtkpod_xml_get_widget (special_xml, "sp_playcount_low");
g_signal_connect ((gpointer)w,
"value_changed",
G_CALLBACK (on_sp_playcount_low_value_changed),
GINT_TO_POINTER(inst));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w),
prefs_get_sp_playcount_low (inst));
- w = glade_xml_get_widget (special_xml, "sp_playcount_high");
+ w = gtkpod_xml_get_widget (special_xml, "sp_playcount_high");
g_signal_connect ((gpointer)w,
"value_changed",
G_CALLBACK (on_sp_playcount_high_value_changed),
@@ -2720,73 +2720,73 @@
prefs_get_sp_playcount_high (inst));
/* PLAYED */
- w = glade_xml_get_widget (special_xml, "sp_played_button");
+ w = gtkpod_xml_get_widget (special_xml, "sp_played_button");
st->ti_played.active = w;
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_cond_button_toggled),
GUINT_TO_POINTER((T_TIME_PLAYED<<SP_SHIFT) + inst));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_sp_cond (inst, T_TIME_PLAYED));
- w = glade_xml_get_widget (special_xml, "sp_played_entry");
+ w = gtkpod_xml_get_widget (special_xml, "sp_played_entry");
st->ti_played.entry = w;
gtk_entry_set_text (GTK_ENTRY (w),
prefs_get_sp_entry (inst, T_TIME_PLAYED));
g_signal_connect ((gpointer)w,
"activate", G_CALLBACK (on_sp_entry_activate),
GUINT_TO_POINTER((T_TIME_PLAYED<<SP_SHIFT) + inst));
- g_signal_connect ((gpointer)glade_xml_get_widget (special_xml,
+ g_signal_connect ((gpointer)gtkpod_xml_get_widget (special_xml,
"sp_played_cal_button"),
"clicked",
G_CALLBACK (on_sp_cal_button_clicked),
GUINT_TO_POINTER((T_TIME_PLAYED<<SP_SHIFT) + inst));
/* MODIFIED */
- w = glade_xml_get_widget (special_xml, "sp_modified_button");
+ w = gtkpod_xml_get_widget (special_xml, "sp_modified_button");
st->ti_modified.active = w;
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_cond_button_toggled),
GUINT_TO_POINTER((T_TIME_MODIFIED<<SP_SHIFT) + inst));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_sp_cond (inst, T_TIME_MODIFIED));
- w = glade_xml_get_widget (special_xml, "sp_modified_entry");
+ w = gtkpod_xml_get_widget (special_xml, "sp_modified_entry");
st->ti_modified.entry = w;
gtk_entry_set_text (GTK_ENTRY (w),
prefs_get_sp_entry (inst, T_TIME_MODIFIED));
g_signal_connect ((gpointer)w,
"activate", G_CALLBACK (on_sp_entry_activate),
GUINT_TO_POINTER((T_TIME_MODIFIED<<SP_SHIFT) + inst));
- g_signal_connect ((gpointer)glade_xml_get_widget (special_xml,
+ g_signal_connect ((gpointer)gtkpod_xml_get_widget (special_xml,
"sp_modified_cal_button"),
"clicked",
G_CALLBACK (on_sp_cal_button_clicked),
GUINT_TO_POINTER((T_TIME_MODIFIED<<SP_SHIFT) + inst));
/* ADDED */
- w = glade_xml_get_widget (special_xml, "sp_added_button");
+ w = gtkpod_xml_get_widget (special_xml, "sp_added_button");
st->ti_added.active = w;
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_cond_button_toggled),
GUINT_TO_POINTER((T_TIME_ADDED<<SP_SHIFT) + inst));
gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(w),
prefs_get_sp_cond (inst, T_TIME_ADDED));
- w = glade_xml_get_widget (special_xml, "sp_added_entry");
+ w = gtkpod_xml_get_widget (special_xml, "sp_added_entry");
st->ti_added.entry = w;
gtk_entry_set_text (GTK_ENTRY (w),
prefs_get_sp_entry (inst, T_TIME_ADDED));
g_signal_connect ((gpointer)w,
"activate", G_CALLBACK (on_sp_entry_activate),
GUINT_TO_POINTER((T_TIME_ADDED<<SP_SHIFT) + inst));
- g_signal_connect ((gpointer)glade_xml_get_widget (special_xml,
+ g_signal_connect ((gpointer)gtkpod_xml_get_widget (special_xml,
"sp_added_cal_button"),
"clicked",
G_CALLBACK (on_sp_cal_button_clicked),
GUINT_TO_POINTER((T_TIME_ADDED<<SP_SHIFT) + inst));
- g_signal_connect ((gpointer)glade_xml_get_widget (special_xml, "sp_go"),
+ g_signal_connect ((gpointer)gtkpod_xml_get_widget (special_xml, "sp_go"),
"clicked", G_CALLBACK (on_sp_go_clicked),
GINT_TO_POINTER(inst));
- w = glade_xml_get_widget (special_xml, "sp_go_always");
+ w = gtkpod_xml_get_widget (special_xml, "sp_go_always");
g_signal_connect ((gpointer)w,
"toggled", G_CALLBACK (on_sp_go_always_toggled),
GINT_TO_POINTER(inst));
@@ -2794,7 +2794,7 @@
prefs_get_sp_autodisplay (inst));
/* Safe pointer to tooltips */
- st->sp_tooltips_data = gtk_tooltips_data_get(glade_xml_get_widget
(special_xml, "sp_modified_entry"));
+ st->sp_tooltips_data = gtk_tooltips_data_get(gtkpod_xml_get_widget
(special_xml, "sp_modified_entry"));
/* Show / don't show tooltips */
g_return_if_fail (st->sp_tooltips_data);
if (prefs_get_display_tooltips_main ())
@@ -3020,7 +3020,7 @@
for (i=0; i<PANED_NUM_GLADE; ++i)
{
gchar *buf = g_strdup_printf ("paned%d", i);
- GtkWidget *w = glade_xml_get_widget (main_window_xml, buf);
+ GtkWidget *w = gtkpod_xml_get_widget (main_window_xml, buf);
g_free (buf);
g_return_if_fail (w);
if (prefs_get_paned_pos (i) != -1)
@@ -3057,7 +3057,7 @@
gchar *buf;
GtkWidget *w;
buf = g_strdup_printf ("paned%d", i);
- if((w = glade_xml_get_widget (main_window_xml, buf)))
+ if((w = gtkpod_xml_get_widget (main_window_xml, buf)))
{
prefs_set_paned_pos (i,
gtk_paned_get_position (GTK_PANED (w)));
@@ -3176,16 +3176,16 @@
switch (type)
{
case LOWER_MARGIN:
- calendar = GTK_CALENDAR (glade_xml_get_widget (cal_xml, "lower_cal"));
- hour = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "lower_hours"));
- min = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "lower_minutes"));
- no_margin = GTK_TOGGLE_BUTTON (glade_xml_get_widget (cal_xml,
"no_lower_margin"));
+ calendar = GTK_CALENDAR (gtkpod_xml_get_widget (cal_xml, "lower_cal"));
+ hour = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml, "lower_hours"));
+ min = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml,
"lower_minutes"));
+ no_margin = GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (cal_xml,
"no_lower_margin"));
break;
case UPPER_MARGIN:
- calendar = GTK_CALENDAR (glade_xml_get_widget (cal_xml, "upper_cal"));
- hour = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "upper_hours"));
- min = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "upper_minutes"));
- no_margin = GTK_TOGGLE_BUTTON (glade_xml_get_widget (cal_xml,
"no_upper_margin"));
+ calendar = GTK_CALENDAR (gtkpod_xml_get_widget (cal_xml, "upper_cal"));
+ hour = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml, "upper_hours"));
+ min = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml,
"upper_minutes"));
+ no_margin = GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (cal_xml,
"no_upper_margin"));
break;
}
cal_set_time_widgets (calendar, hour, min, no_margin, mactime);
@@ -3215,18 +3215,18 @@
switch (type)
{
case LOWER_MARGIN:
- calendar = GTK_CALENDAR (glade_xml_get_widget (cal_xml, "lower_cal"));
- hour = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "lower_hours"));
- min = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "lower_minutes"));
- no_margin = GTK_TOGGLE_BUTTON (glade_xml_get_widget (cal_xml,
"no_lower_margin"));
- no_time = GTK_TOGGLE_BUTTON (glade_xml_get_widget (cal_xml,
"lower_time"));
+ calendar = GTK_CALENDAR (gtkpod_xml_get_widget (cal_xml, "lower_cal"));
+ hour = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml, "lower_hours"));
+ min = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml,
"lower_minutes"));
+ no_margin = GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (cal_xml,
"no_lower_margin"));
+ no_time = GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (cal_xml,
"lower_time"));
break;
case UPPER_MARGIN:
- calendar = GTK_CALENDAR (glade_xml_get_widget (cal_xml, "upper_cal"));
- hour = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "upper_hours"));
- min = GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "upper_minutes"));
- no_margin = GTK_TOGGLE_BUTTON (glade_xml_get_widget (cal_xml,
"no_upper_margin"));
- no_time = GTK_TOGGLE_BUTTON (glade_xml_get_widget (cal_xml,
"upper_time"));
+ calendar = GTK_CALENDAR (gtkpod_xml_get_widget (cal_xml, "upper_cal"));
+ hour = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml, "upper_hours"));
+ min = GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml,
"upper_minutes"));
+ no_margin = GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (cal_xml,
"no_upper_margin"));
+ no_time = GTK_TOGGLE_BUTTON (gtkpod_xml_get_widget (cal_xml,
"upper_time"));
break;
}
@@ -3288,7 +3288,7 @@
T_item item;
gint i = -1;
- w = glade_xml_get_widget (cal_xml, "cat_combo");
+ w = gtkpod_xml_get_widget (cal_xml, "cat_combo");
str = gtk_entry_get_text (GTK_ENTRY (GTK_COMBO (w)->entry));
/* Check which string is selected in the combo */
if (str)
@@ -3343,7 +3343,7 @@
/* Get selected instance */
inst = gtk_spin_button_get_value_as_int (
- GTK_SPIN_BUTTON (glade_xml_get_widget (cal_xml, "sorttab_num_spin"))) -
1;
+ GTK_SPIN_BUTTON (gtkpod_xml_get_widget (cal_xml, "sorttab_num_spin")))
- 1;
/* Get selected category (played, modified or added) */
item = cal_get_category (cal);
/* Get pointer to corresponding TimeInfo struct */
@@ -3398,13 +3398,13 @@
{
gboolean sens = gtk_toggle_button_get_active (togglebutton);
- if ((GtkWidget *)togglebutton == glade_xml_get_widget (cal_xml,
"lower_time"))
+ if ((GtkWidget *)togglebutton == gtkpod_xml_get_widget (cal_xml,
"lower_time"))
{
- gtk_widget_set_sensitive (glade_xml_get_widget (cal_xml,
"lower_time_box"), sens);
+ gtk_widget_set_sensitive (gtkpod_xml_get_widget (cal_xml,
"lower_time_box"), sens);
}
- if ((GtkWidget *)togglebutton == glade_xml_get_widget (cal_xml,
"upper_time"))
+ if ((GtkWidget *)togglebutton == gtkpod_xml_get_widget (cal_xml,
"upper_time"))
{
- gtk_widget_set_sensitive (glade_xml_get_widget (cal_xml,
"upper_time_box"), sens);
+ gtk_widget_set_sensitive (gtkpod_xml_get_widget (cal_xml,
"upper_time_box"), sens);
}
}
@@ -3414,13 +3414,13 @@
{
gboolean sens = !gtk_toggle_button_get_active (togglebutton);
- if ((GtkWidget *)togglebutton == glade_xml_get_widget (cal_xml,
"no_lower_margin"))
+ if ((GtkWidget *)togglebutton == gtkpod_xml_get_widget (cal_xml,
"no_lower_margin"))
{
- gtk_widget_set_sensitive (glade_xml_get_widget (cal_xml,
"lower_cal_box"), sens);
+ gtk_widget_set_sensitive (gtkpod_xml_get_widget (cal_xml,
"lower_cal_box"), sens);
}
- if ((GtkWidget *)togglebutton == glade_xml_get_widget (cal_xml,
"no_upper_margin"))
+ if ((GtkWidget *)togglebutton == gtkpod_xml_get_widget (cal_xml,
"no_upper_margin"))
{
- gtk_widget_set_sensitive (glade_xml_get_widget (cal_xml,
"upper_cal_box"), sens);
+ gtk_widget_set_sensitive (gtkpod_xml_get_widget (cal_xml,
"upper_cal_box"), sens);
}
}
@@ -3488,14 +3488,14 @@
glade_xml_signal_autoconnect (cal_xml);
- cal = glade_xml_get_widget (cal_xml, "calendar_window");
+ cal = gtkpod_xml_get_widget (cal_xml, "calendar_window");
/* Set to saved size */
prefs_get_size_cal (&defx, &defy);
gtk_window_set_default_size (GTK_WINDOW (cal), defx, defy);
/* Set sorttab number */
- w = glade_xml_get_widget (cal_xml, "sorttab_num_spin");
+ w = gtkpod_xml_get_widget (cal_xml, "sorttab_num_spin");
gtk_spin_button_set_range (GTK_SPIN_BUTTON (w),
1, SORT_TAB_MAX);
gtk_spin_button_set_value (GTK_SPIN_BUTTON (w), inst+1);
@@ -3506,7 +3506,7 @@
const gchar **bp = cat_strings;
while (*bp) catlist = g_list_append (catlist, gettext (*bp++));
}
- w = glade_xml_get_widget (cal_xml, "cat_combo");
+ w = gtkpod_xml_get_widget (cal_xml, "cat_combo");
gtk_combo_set_popdown_strings (GTK_COMBO (w), catlist);
switch (item)
{
@@ -3539,12 +3539,12 @@
}
/* Lower Margin */
- w = glade_xml_get_widget (cal_xml, "no_lower_margin");
+ w = gtkpod_xml_get_widget (cal_xml, "no_lower_margin");
g_signal_connect (w,
"toggled",
G_CALLBACK (cal_no_margin_toggled),
cal);
- w = glade_xml_get_widget (cal_xml, "lower_time");
+ w = gtkpod_xml_get_widget (cal_xml, "lower_time");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
g_signal_connect (w,
"toggled",
@@ -3554,12 +3554,12 @@
cal_set_time (cal, LOWER_MARGIN, ti->lower);
/* Upper Margin */
- w = glade_xml_get_widget (cal_xml, "no_upper_margin");
+ w = gtkpod_xml_get_widget (cal_xml, "no_upper_margin");
g_signal_connect (w,
"toggled",
G_CALLBACK (cal_no_margin_toggled),
cal);
- w = glade_xml_get_widget (cal_xml, "upper_time");
+ w = gtkpod_xml_get_widget (cal_xml, "upper_time");
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
g_signal_connect (w,
"toggled",
@@ -3572,13 +3572,13 @@
g_signal_connect (cal, "delete_event",
G_CALLBACK (cal_delete_event), cal);
/* Connect cancel-button */
- g_signal_connect (glade_xml_get_widget (cal_xml, "cal_cancel"), "clicked",
+ g_signal_connect (gtkpod_xml_get_widget (cal_xml, "cal_cancel"), "clicked",
G_CALLBACK (cal_cancel), cal);
/* Connect apply-button */
- g_signal_connect (glade_xml_get_widget (cal_xml, "cal_apply"), "clicked",
+ g_signal_connect (gtkpod_xml_get_widget (cal_xml, "cal_apply"), "clicked",
G_CALLBACK (cal_apply), cal);
/* Connect ok-button */
- g_signal_connect (glade_xml_get_widget (cal_xml, "cal_ok"), "clicked",
+ g_signal_connect (gtkpod_xml_get_widget (cal_xml, "cal_ok"), "clicked",
G_CALLBACK (cal_ok), cal);
gtk_widget_show (cal);
Index: display_spl.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/display_spl.c,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- display_spl.c 19 Nov 2005 07:29:46 -0000 1.14
+++ display_spl.c 26 Nov 2005 13:44:41 -0000 1.15
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-19 15:41:45 jcs>
+/* Time-stamp: <2005-11-25 23:52:13 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users.sourceforge.net>
| Part of the gtkpod project.
@@ -290,7 +290,7 @@
g_return_if_fail (spl);
if (gtk_toggle_button_get_active (togglebutton))
{
- GtkWidget *frame = glade_xml_get_widget (spl_window_xml,
"spl_rules_frame");
+ GtkWidget *frame = gtkpod_xml_get_widget (spl_window_xml,
"spl_rules_frame");
g_return_if_fail (frame);
gtk_widget_set_sensitive (frame, TRUE);
spl->splpref.checkrules = TRUE;
@@ -308,7 +308,7 @@
g_return_if_fail (spl);
if (gtk_toggle_button_get_active (togglebutton))
{
- GtkWidget *frame = glade_xml_get_widget (spl_window_xml,
"spl_rules_frame");
+ GtkWidget *frame = gtkpod_xml_get_widget (spl_window_xml,
"spl_rules_frame");
g_return_if_fail (frame);
gtk_widget_set_sensitive (frame, TRUE);
spl->splpref.checkrules = TRUE;
@@ -325,7 +325,7 @@
g_return_if_fail (spl_window);
spl = g_object_get_data (G_OBJECT (spl_window), "spl_work");
g_return_if_fail (spl);
- frame = glade_xml_get_widget (spl_window_xml, "spl_rules_frame");
+ frame = gtkpod_xml_get_widget (spl_window_xml, "spl_rules_frame");
g_return_if_fail (frame);
if (gtk_toggle_button_get_active (togglebutton))
{
@@ -754,7 +754,7 @@
g_return_if_fail (itdb != NULL);
/* Read out new playlist name */
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_name_entry")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_name_entry")))
{
g_free (spl_orig->name);
spl_orig->name = gtk_editable_get_chars (GTK_EDITABLE (w), 0, -1);
@@ -796,7 +796,7 @@
spl = g_object_get_data (G_OBJECT (spl_window), "spl_work");
g_return_if_fail (spl);
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_checklimits_button")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_checklimits_button")))
{
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (w), spl->splpref.checklimits);
@@ -805,7 +805,7 @@
spl_window);
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_limitvalue_entry")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_limitvalue_entry")))
{
gchar str[WNLEN];
snprintf (str, WNLEN, "%d", spl->splpref.limitvalue);
@@ -816,7 +816,7 @@
spl_window);
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_limittype_combobox")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_limittype_combobox")))
{
spl_set_combobox (GTK_COMBO_BOX (w),
limittype_comboentries,
@@ -826,12 +826,12 @@
gtk_widget_set_sensitive (w, spl->splpref.checklimits);
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_limitsort_label")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_limitsort_label")))
{
gtk_widget_set_sensitive (w, spl->splpref.checklimits);
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_limitsort_combobox")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_limitsort_combobox")))
{
spl_set_combobox (GTK_COMBO_BOX (w),
limitsort_comboentries,
@@ -1308,7 +1308,7 @@
g_return_if_fail (spl_window);
spl = g_object_get_data (G_OBJECT (spl_window), "spl_work");
g_return_if_fail (spl);
- align = glade_xml_get_widget (spl_window_xml, "spl_rules_table_align");
+ align = gtkpod_xml_get_widget (spl_window_xml, "spl_rules_table_align");
g_return_if_fail (align);
/* Destroy table if it already exists */
table = g_object_get_data (G_OBJECT (spl_window),
@@ -1393,7 +1393,7 @@
g_return_if_fail (itdb != NULL);
spl_window_xml = glade_xml_new (xml_file, "spl_window", NULL);
- spl_window = glade_xml_get_widget (spl_window_xml, "spl_window");
+ spl_window = gtkpod_xml_get_widget (spl_window_xml, "spl_window");
g_return_if_fail (spl_window != NULL);
@@ -1406,13 +1406,13 @@
g_object_set_data (G_OBJECT (spl_window), "spl_pos",
GINT_TO_POINTER(pos));
g_object_set_data (G_OBJECT (spl_window), "spl_itdb", itdb);
/* Set checkboxes and connect signal handlers */
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_name_entry")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_name_entry")))
{
if (spl_dup->name)
gtk_entry_set_text (GTK_ENTRY (w), spl_dup->name);
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_all_radio")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_all_radio")))
{
g_signal_connect (w, "toggled",
G_CALLBACK (spl_all_radio_toggled),
@@ -1421,7 +1421,7 @@
GTK_TOGGLE_BUTTON (w),
(spl_dup->splrules.match_operator == SPLMATCH_AND));
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_any_radio")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_any_radio")))
{
g_signal_connect (w, "toggled",
G_CALLBACK (spl_any_radio_toggled),
@@ -1430,7 +1430,7 @@
GTK_TOGGLE_BUTTON (w),
(spl_dup->splrules.match_operator == SPLMATCH_OR));
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_none_radio")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_none_radio")))
{
g_signal_connect (w, "toggled",
G_CALLBACK (spl_none_radio_toggled),
@@ -1439,7 +1439,7 @@
GTK_TOGGLE_BUTTON (w), !spl_dup->splpref.checkrules);
}
- if ((w = glade_xml_get_widget (spl_window_xml,
"spl_matchcheckedonly_button")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml,
"spl_matchcheckedonly_button")))
{
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (w), spl_dup->splpref.matchcheckedonly);
@@ -1448,7 +1448,7 @@
spl_window);
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_liveupdate_button")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_liveupdate_button")))
{
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (w), spl_dup->splpref.liveupdate);
@@ -1458,12 +1458,12 @@
}
/* Signals for Cancel, OK, Delete */
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_cancel_button")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_cancel_button")))
{
g_signal_connect (w, "clicked",
G_CALLBACK (spl_cancel), spl_window);
}
- if ((w = glade_xml_get_widget (spl_window_xml, "spl_ok_button")))
+ if ((w = gtkpod_xml_get_widget (spl_window_xml, "spl_ok_button")))
{
g_signal_connect (w, "clicked",
G_CALLBACK (spl_ok), spl_window);
Index: file_export.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/file_export.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- file_export.c 23 Nov 2005 04:16:12 -0000 1.55
+++ file_export.c 26 Nov 2005 13:44:41 -0000 1.56
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-22 01:12:17 jcs>
+/* Time-stamp: <2005-11-25 23:52:13 jcs>
|
| Copyright (C) 2002 Corey Donohoe <atmos at atmos.org>
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -573,9 +573,9 @@
NULL);
export_files_xml = glade_xml_new (xml_file, "export_files_options", NULL);
- win = glade_xml_get_widget (export_files_xml, "export_files_options");
- options = glade_xml_get_widget (export_files_xml, "options_frame");
- message_box = glade_xml_get_widget (export_files_xml, "message_box");
+ win = gtkpod_xml_get_widget (export_files_xml, "export_files_options");
+ options = gtkpod_xml_get_widget (export_files_xml, "options_frame");
+ message_box = gtkpod_xml_get_widget (export_files_xml, "message_box");
/* Information needed to clean up later */
fcd = g_malloc0 (sizeof (struct fcd));
@@ -599,9 +599,9 @@
if (display)
{
GList *gl;
- GtkWidget *label = glade_xml_get_widget (export_files_xml,
+ GtkWidget *label = gtkpod_xml_get_widget (export_files_xml,
"message");
- GtkWidget *tv = glade_xml_get_widget (export_files_xml,
+ GtkWidget *tv = gtkpod_xml_get_widget (export_files_xml,
"textview");
GtkTextBuffer *tb = gtk_text_view_get_buffer (GTK_TEXT_VIEW(tv));
if (message) gtk_label_set_text (GTK_LABEL (label), message);
@@ -1077,9 +1077,9 @@
GladeXML *export_playlist_xml;
export_playlist_xml = glade_xml_new (xml_file,
"export_playlist_file_options", NULL);
- win = glade_xml_get_widget (export_playlist_xml,
"export_playlist_file_options");
+ win = gtkpod_xml_get_widget (export_playlist_xml,
"export_playlist_file_options");
- options = glade_xml_get_widget (export_playlist_xml, "options_frame");
+ options = gtkpod_xml_get_widget (export_playlist_xml, "options_frame");
/* Information needed to clean up later */
fcd->tracks = g_list_copy (tracks);
Index: info.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/info.c,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -d -r1.33 -r1.34
--- info.c 20 Sep 2005 09:50:13 -0000 1.33
+++ info.c 26 Nov 2005 13:44:41 -0000 1.34
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-09-18 22:58:46 jcs>
+/* Time-stamp: <2005-11-25 23:52:12 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -94,7 +94,7 @@
g_return_if_fail (info_window);
g_return_if_fail (w_name);
- w = glade_xml_get_widget (info_xml, w_name);
+ w = gtkpod_xml_get_widget (info_xml, w_name);
if (w)
{
gchar *str = g_strdup_printf ("%u", nr);
@@ -109,7 +109,7 @@
g_return_if_fail (info_window);
g_return_if_fail (w_name);
- w = glade_xml_get_widget (info_xml, w_name);
+ w = gtkpod_xml_get_widget (info_xml, w_name);
if (w)
{
gchar *str = g_strdup_printf ("%u:%02u:%02u",
@@ -127,7 +127,7 @@
g_return_if_fail (info_window);
g_return_if_fail (w_name);
- w = glade_xml_get_widget (info_xml, w_name);
+ w = gtkpod_xml_get_widget (info_xml, w_name);
if (w)
{
gchar *str = get_filesize_as_string (size);
@@ -142,7 +142,7 @@
g_return_if_fail (info_window);
g_return_if_fail (w_name);
- w = glade_xml_get_widget (info_xml, w_name);
+ w = gtkpod_xml_get_widget (info_xml, w_name);
if (w)
{
gtk_label_set_text (GTK_LABEL (w), str);
@@ -162,7 +162,7 @@
info_xml = glade_xml_new (xml_file, "gtkpod_info", NULL);
glade_xml_signal_autoconnect (info_xml);
- info_window = glade_xml_get_widget (info_xml, "gtkpod_info");
+ info_window = gtkpod_xml_get_widget (info_xml, "gtkpod_info");
if (info_window)
{
@@ -394,7 +394,7 @@
void
gtkpod_statusbar_init(void)
{
- gtkpod_statusbar = glade_xml_get_widget (main_window_xml, "gtkpod_status");
+ gtkpod_statusbar = gtkpod_xml_get_widget (main_window_xml,
"gtkpod_status");
}
static gint
@@ -440,7 +440,7 @@
gtkpod_tracks_statusbar_init()
{
gtkpod_tracks_statusbar =
- glade_xml_get_widget (main_window_xml, "tracks_statusbar");
+ gtkpod_xml_get_widget (main_window_xml, "tracks_statusbar");
gtkpod_tracks_statusbar_update();
}
@@ -804,7 +804,7 @@
void
gtkpod_space_statusbar_init(void)
{
- gtkpod_space_statusbar = glade_xml_get_widget (main_window_xml,
"space_statusbar");
+ gtkpod_space_statusbar = gtkpod_xml_get_widget (main_window_xml,
"space_statusbar");
if (!space_mutex)
{
Index: main.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/main.c,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- main.c 23 Sep 2005 17:36:58 -0000 1.46
+++ main.c 26 Nov 2005 13:44:41 -0000 1.47
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-07-08 23:04:28 jcs>
+/* Time-stamp: <2005-11-25 23:52:12 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -120,7 +120,7 @@
glade_xml_signal_autoconnect (main_window_xml);
- gtkpod_window = glade_xml_get_widget (main_window_xml, "gtkpod");
+ gtkpod_window = gtkpod_xml_get_widget (main_window_xml, "gtkpod");
if (!read_prefs (gtkpod_window, argc, argv)) return 0;
Index: misc.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc.c,v
retrieving revision 1.189
retrieving revision 1.190
diff -u -d -r1.189 -r1.190
--- misc.c 25 Nov 2005 14:12:05 -0000 1.189
+++ misc.c 26 Nov 2005 13:44:41 -0000 1.190
@@ -1,5 +1,5 @@
/* -*- coding: utf-8; -*-
-| Time-stamp: <2005-11-25 23:05:02 jcs>
+| Time-stamp: <2005-11-26 16:51:11 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -71,10 +71,10 @@
about_xml = glade_xml_new (xml_file, "gtkpod_about_window", NULL);
glade_xml_signal_autoconnect (about_xml);
- about_window = glade_xml_get_widget (about_xml, "gtkpod_about_window");
+ about_window = gtkpod_xml_get_widget (about_xml, "gtkpod_about_window");
- about_label = GTK_LABEL (glade_xml_get_widget (about_xml, "about_label"));
+ about_label = GTK_LABEL (gtkpod_xml_get_widget (about_xml, "about_label"));
label_text = g_strdup_printf (_("gtkpod Version %s: Cross-Platform
Multi-Lingual Interface to Apple's iPod(tm)."), VERSION);
gtk_label_set_text (about_label, label_text);
g_free (label_text);
@@ -183,7 +183,7 @@
The GUI was created with the help of glade-2 (http://glade.gnome.org/).\n"),
NULL };
gchar **strp = text;
- textview = GTK_TEXT_VIEW (glade_xml_get_widget (about_xml,
"credits_textview"));
+ textview = GTK_TEXT_VIEW (gtkpod_xml_get_widget (about_xml,
"credits_textview"));
tb = gtk_text_view_get_buffer (textview);
while (*strp)
{
@@ -210,7 +210,7 @@
Swedish: Stefan Asserhall (stefan asserhall at comhem dot se)\n"),
NULL };
gchar **strp = text;
- textview = GTK_TEXT_VIEW (glade_xml_get_widget (about_xml,
"translators_textview"));
+ textview = GTK_TEXT_VIEW (gtkpod_xml_get_widget (about_xml,
"translators_textview"));
tb = gtk_text_view_get_buffer (textview);
while (*strp)
{
@@ -807,7 +807,7 @@
prefs_set_int_value (prefs_string, 0);
wnum = 0;
}
- w = glade_xml_get_widget (win_xml, widgets[wnum]);
+ w = gtkpod_xml_get_widget (win_xml, widgets[wnum]);
if (w)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (w), TRUE);
}
@@ -825,7 +825,7 @@
for (i=0; widgets[i]; ++i)
{
- GtkWidget *w = glade_xml_get_widget (win_xml, widgets[i]);
+ GtkWidget *w = gtkpod_xml_get_widget (win_xml, widgets[i]);
if (w)
{
if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (w)))
@@ -927,7 +927,7 @@
if (!string)
string = g_strdup (dflt);
- entry = glade_xml_get_widget (win_xml, name);
+ entry = gtkpod_xml_get_widget (win_xml, name);
if (entry)
gtk_entry_set_text(GTK_ENTRY(entry), string);
@@ -947,7 +947,7 @@
g_return_if_fail (win_xml && name);
- entry = glade_xml_get_widget (win_xml, name);
+ entry = gtkpod_xml_get_widget (win_xml, name);
if (entry)
{
@@ -972,7 +972,7 @@
if (!prefs_get_int_value (name, &active))
active = dflt;
- button = glade_xml_get_widget (win_xml, name);
+ button = gtkpod_xml_get_widget (win_xml, name);
if (button)
gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(button),
@@ -990,7 +990,7 @@
g_return_val_if_fail (win_xml && name, active);
- button = glade_xml_get_widget (win_xml, name);
+ button = gtkpod_xml_get_widget (win_xml, name);
if (button)
{
@@ -1375,7 +1375,7 @@
/**
- * Wrapper for glade_xml_get_widget() giving out a warning if widget
+ * Wrapper for gtkpod_xml_get_widget() giving out a warning if widget
* could not be found.
*
**/
Index: misc_input.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_input.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- misc_input.c 17 Jun 2005 13:30:04 -0000 1.11
+++ misc_input.c 26 Nov 2005 13:44:41 -0000 1.12
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-06-17 22:12:15 jcs>
+/* Time-stamp: <2005-11-25 23:52:11 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -264,7 +264,7 @@
GtkWidget *w;
struct blocked_widget *bw;
- if((w = glade_xml_get_widget (main_window_xml, name)))
+ if((w = gtkpod_xml_get_widget (main_window_xml, name)))
{
bw = g_malloc0 (sizeof (struct blocked_widget));
bw->widget = w;
Index: podcast.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/podcast.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- podcast.c 12 Nov 2005 08:54:31 -0000 1.6
+++ podcast.c 26 Nov 2005 13:44:41 -0000 1.7
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 16:08:34 jcs>
+/* Time-stamp: <2005-11-25 23:52:11 jcs>
|
| Copyright (C) 2002-2005 Alexander Dutton <alexdutton at f2s dot com>
| Part of the gtkpod project.
@@ -680,10 +680,10 @@
if (t == 0 || transfer_total == 0) return 0;
if (d/t > 1 || (d+transfer_done)/transfer_total > 1) return 0;
gdk_threads_enter();
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR (glade_xml_get_widget
(podcast_window_xml, "file_progressbar")), d/t);
- gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR (glade_xml_get_widget
(podcast_window_xml, "total_progressbar")), (d+transfer_done)/transfer_total);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR (gtkpod_xml_get_widget
(podcast_window_xml, "file_progressbar")), d/t);
+ gtk_progress_bar_set_fraction(GTK_PROGRESS_BAR (gtkpod_xml_get_widget
(podcast_window_xml, "total_progressbar")), (d+transfer_done)/transfer_total);
tmp = g_strdup_printf("%.2fMb of %.2fMb (%.0f%%), 12:32 remaining",
(double) (d+transfer_done)/1024/1024, (double) transfer_total/1024/1024,
100*(d+transfer_done)/transfer_total);
- gtk_progress_bar_set_text(GTK_PROGRESS_BAR (glade_xml_get_widget
(podcast_window_xml, "total_progressbar")), tmp);
+ gtk_progress_bar_set_text(GTK_PROGRESS_BAR (gtkpod_xml_get_widget
(podcast_window_xml, "total_progressbar")), tmp);
g_free(tmp);
gdk_threads_leave();
@@ -1011,7 +1011,7 @@
podcast_window_xml = glade_xml_new (xml_file, "podcast_window", NULL);
glade_xml_signal_autoconnect (podcast_window_xml);
- podcast_window = glade_xml_get_widget(podcast_window_xml,"podcast_window");
+ podcast_window =
gtkpod_xml_get_widget(podcast_window_xml,"podcast_window");
g_return_if_fail (podcast_window);
@@ -1071,7 +1071,7 @@
g_object_unref (model);
- podcast_list_window = glade_xml_get_widget (podcast_window_xml,
"podcast_list_window");
+ podcast_list_window = gtkpod_xml_get_widget (podcast_window_xml,
"podcast_list_window");
gtk_container_add (GTK_CONTAINER (podcast_list_window),
GTK_WIDGET(podcast_list));
if(podcast_list_window)
@@ -1085,7 +1085,7 @@
void podcast_set_status(gchar *status)
{
gdk_threads_enter();
- gtk_label_set_text (GTK_LABEL (glade_xml_get_widget (podcast_window_xml,
"status_label")), status);
+ gtk_label_set_text (GTK_LABEL (gtkpod_xml_get_widget (podcast_window_xml,
"status_label")), status);
gdk_threads_leave();
while (gtk_events_pending()) gtk_main_iteration();
}
@@ -1095,7 +1095,7 @@
if (g_strrstr(text, "/"))
{
gchar *working = g_strdup_printf("%s", g_strrstr(text, "/")+1);
- gtk_progress_bar_set_text (GTK_PROGRESS_BAR (glade_xml_get_widget
(podcast_window_xml, "file_progressbar")), working);
+ gtk_progress_bar_set_text (GTK_PROGRESS_BAR (gtkpod_xml_get_widget
(podcast_window_xml, "file_progressbar")), working);
g_free(working);
}
}
Index: prefs.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/prefs.c,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- prefs.c 25 Nov 2005 14:12:05 -0000 1.152
+++ prefs.c 26 Nov 2005 13:44:41 -0000 1.153
@@ -1,4 +1,4 @@
-/* Time-stamp: <2005-11-12 17:49:22 jcs>
+/* Time-stamp: <2005-11-25 23:52:11 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -1133,7 +1133,7 @@
podcast_read_from_file();
podcast_file_read_from_file();
- menu = GTK_CHECK_MENU_ITEM (glade_xml_get_widget (main_window_xml,
"offline_menu"));
+ menu = GTK_CHECK_MENU_ITEM (gtkpod_xml_get_widget (main_window_xml,
"offline_menu"));
gtk_check_menu_item_set_active (menu, prefs_get_offline ());
return result;
}
-------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc. Do you grep through log files
for problems? Stop! Download the new AJAX search engine that makes
searching your log files as easy as surfing the web. DOWNLOAD SPLUNK!
http://ads.osdn.com/?ad_id=7637&alloc_id=16865&op=click
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
