commit 9459af817cffd0c7a066e2632a1b72e9cf64912a
Author: phantomjinx <[email protected]>
Date: Thu Jul 22 14:22:16 2010 +0100
Fix some TODO messages hanging around and general tidy up
plugins/core_preferences/core_prefs.c | 19 +----
plugins/repository_editor/repository_editor.c | 70 +++++++--------
src/anjuta-about.c | 1 -
src/display_itdb.c | 7 +-
src/display_sorttabs.c | 119 ++-----------------------
src/display_tracks.c | 3 +-
src/file.c | 3 +-
src/file_convert.h | 2 +-
src/file_export.c | 1 -
src/file_itunesdb.c | 18 ++--
src/gtkpod.c | 2 +-
src/misc.c | 6 --
src/misc_playlist.c | 6 +-
src/misc_track.c | 33 ++++----
src/sha1.c | 1 -
15 files changed, 76 insertions(+), 215 deletions(-)
---
diff --git a/plugins/core_preferences/core_prefs.c
b/plugins/core_preferences/core_prefs.c
index 5e1b815..0d28d3a 100644
--- a/plugins/core_preferences/core_prefs.c
+++ b/plugins/core_preferences/core_prefs.c
@@ -31,6 +31,7 @@
#include "libgtkpod/prefs.h"
#include "libgtkpod/charset.h"
#include "libgtkpod/misc.h"
+#include "libgtkpod/file_convert.h"
#include "core_prefs.h"
#include "plugin.h"
@@ -250,18 +251,6 @@ G_MODULE_EXPORT void on_browse_button_clicked (GtkButton
*sender, gpointer e)
/*
glade callback
*/
-G_MODULE_EXPORT void on_display_tooltips_toggled (GtkToggleButton *sender,
gpointer e)
-{
- gboolean active = gtk_toggle_button_get_active (sender);
-
- prefs_set_int ("display_tooltips", active);
- g_message("TODO - show hide tooltips commented out");
-// display_show_hide_tooltips ();
-}
-
-/*
- glade callback
-*/
G_MODULE_EXPORT void on_unsetdeps_checkbox_toggled (GtkToggleButton *sender,
gpointer e)
{
if(builder && !gtk_toggle_button_get_active (sender))
@@ -687,8 +676,7 @@ G_MODULE_EXPORT void on_conversion_settings_clicked
(GtkButton *sender, gpointer
gtk_builder_connect_signals(builder, NULL);
gtk_dialog_run (GTK_DIALOG (dlg));
gtk_widget_destroy (dlg);
- g_message("TODO - signal that the convert preferences have changed");
-// file_convert_prefs_changed ();
+ file_convert_prefs_changed ();
}
/*
@@ -741,8 +729,7 @@ G_MODULE_EXPORT void on_target_format_changed (GtkComboBox
*sender, gpointer e)
prefs_set_int ("conversion_target_format", index);
g_free (script);
- g_message("TODO - signal that the convert preferences have changed");
- // file_convert_prefs_changed ();
+ file_convert_prefs_changed ();
}
/*
diff --git a/plugins/repository_editor/repository_editor.c
b/plugins/repository_editor/repository_editor.c
index bd3d426..d627b4a 100644
--- a/plugins/repository_editor/repository_editor.c
+++ b/plugins/repository_editor/repository_editor.c
@@ -155,7 +155,7 @@ static void repository_playlist_selected_cb(GtkPodApp *app,
gpointer pl, gpointe
iTunesDB *itdb = NULL;
if (!playlist) {
- return;
+ return;
}
itdb = playlist->itdb;
@@ -311,7 +311,8 @@ static void update_buttons() {
}
gtk_widget_set_sensitive(GET_WIDGET (repository_view->xml,
SYNC_OPTIONS_HBOX), sens);
- key = get_playlist_prefs_key(repository_view->itdb_index,
repository_view->playlist, KEY_SYNC_DELETE_TRACKS);
+ key
+ = get_playlist_prefs_key(repository_view->itdb_index,
repository_view->playlist, KEY_SYNC_DELETE_TRACKS);
val = get_current_prefs_int(key);
g_free(key);
gtk_widget_set_sensitive(GET_WIDGET (repository_view->xml,
PLAYLIST_SYNC_CONFIRM_DELETE_TOGGLE), val);
@@ -645,38 +646,32 @@ static void edit_apply_clicked(GtkButton *button) {
deleted = temp_prefs_get_int(repository_view->extra_prefs, key);
g_free(key);
if (deleted) {
- /* FIXME: ask if serious, then delete */
- if (TRUE) {
- iTunesDB *itdb;
- gint j;
-
- /* flush all keys relating to the deleted itdb */
- key = get_itdb_prefs_key(i - del_num, "");
- prefs_flush_subkey(key);
- g_free(key);
-
- for (j = i - del_num; j < itdb_num - del_num - 1; ++j) {
- gchar *from_key = get_itdb_prefs_key(j + 1, "");
- gchar *to_key = get_itdb_prefs_key(j, "");
- prefs_rename_subkey(from_key, to_key);
- g_free(from_key);
- g_free(to_key);
- }
+ iTunesDB *itdb;
+ gint j;
- itdb = g_list_nth_data(itdbs_head->itdbs, i - del_num);
- gp_itdb_remove(itdb);
- gp_itdb_free(itdb);
+ /* flush all keys relating to the deleted itdb */
+ key = get_itdb_prefs_key(i - del_num, "");
+ prefs_flush_subkey(key);
+ g_free(key);
- /* keep itdb_index of currently displayed repository
- updated in case we need to select a new one */
- if (repository_view->itdb_index > i - del_num) {
- --repository_view->itdb_index;
- }
- ++del_num;
+ for (j = i - del_num; j < itdb_num - del_num - 1; ++j) {
+ gchar *from_key = get_itdb_prefs_key(j + 1, "");
+ gchar *to_key = get_itdb_prefs_key(j, "");
+ prefs_rename_subkey(from_key, to_key);
+ g_free(from_key);
+ g_free(to_key);
}
- else {
- deleted = FALSE;
+
+ itdb = g_list_nth_data(itdbs_head->itdbs, i - del_num);
+ gp_itdb_remove(itdb);
+ gp_itdb_free(itdb);
+
+ /* keep itdb_index of currently displayed repository
+ updated in case we need to select a new one */
+ if (repository_view->itdb_index > i - del_num) {
+ --repository_view->itdb_index;
}
+ ++del_num;
}
if (!deleted) {
@@ -704,8 +699,6 @@ static void edit_apply_clicked(GtkButton *button) {
g_free(key);
if (str) { /* have to set mountpoint */
itdb_set_mountpoint(itdb, str);
- g_message("TODO: edit_apply_clicked - space_set_ipod_itdb");
- // space_set_ipod_itdb(itdb);
g_free(str);
}
@@ -1224,7 +1217,8 @@ static void display_playlist_info() {
break;
}
/* make options available where appropriate */
- gtk_widget_set_sensitive(GET_WIDGET (repository_view->xml,
SYNC_OPTIONS_HBOX), syncmode != SYNC_PLAYLIST_MODE_NONE);
+ gtk_widget_set_sensitive(GET_WIDGET (repository_view->xml,
SYNC_OPTIONS_HBOX), syncmode
+ != SYNC_PLAYLIST_MODE_NONE);
/* set standard toggle buttons */
for (i = 0; widget_names[i]; ++i) {
key = get_playlist_prefs_key(index, playlist, key_names[i]);
@@ -1242,7 +1236,7 @@ static void init_repository_combo() {
g_return_if_fail (repository_view);
- if (! repository_view->repository_combo_box) {
+ if (!repository_view->repository_combo_box) {
repository_view->repository_combo_box = GTK_COMBO_BOX (GET_WIDGET
(repository_view->xml, REPOSITORY_COMBO));
}
@@ -1266,9 +1260,9 @@ static void init_playlist_combo() {
g_return_if_fail (repository_view);
g_return_if_fail (repository_view->itdb);
- if (! repository_view->playlist_combo_box) {
+ if (!repository_view->playlist_combo_box) {
repository_view->playlist_combo_box = GTK_COMBO_BOX
(gtkpod_xml_get_widget (repository_view->xml,
- PLAYLIST_COMBO));
+ PLAYLIST_COMBO));
}
if (g_object_get_data(G_OBJECT (repository_view->playlist_combo_box),
"combo_set") == NULL) {
@@ -1450,7 +1444,7 @@ static void create_repository_editor_view() {
G_CALLBACK (new_repository_button_clicked), repository_view);
g_signal_connect (GET_WIDGET (repository_view->xml, APPLY_BUTTON),
"clicked",
- G_CALLBACK (edit_apply_clicked), repository_view);
+ G_CALLBACK (edit_apply_clicked), repository_view);
init_repository_combo();
@@ -1468,7 +1462,7 @@ static void create_repository_editor_view() {
}
void destroy_repository_editor() {
- if (! repository_view)
+ if (!repository_view)
return;
/* Remove widgets from Shell */
diff --git a/src/anjuta-about.c b/src/anjuta-about.c
index af735ef..e0d0468 100644
--- a/src/anjuta-about.c
+++ b/src/anjuta-about.c
@@ -189,7 +189,6 @@ about_box_new ()
}
gchar *pixpath = g_build_filename(get_icon_dir(), "48x48",
"gtkpod.png", NULL);
- g_message(pixpath);
pix = gdk_pixbuf_new_from_file(pixpath, NULL);
dialog = gtk_about_dialog_new();
gtk_about_dialog_set_program_name(GTK_ABOUT_DIALOG(dialog), "gtkpod");
diff --git a/src/display_itdb.c b/src/display_itdb.c
index 79a6593..6b1682d 100644
--- a/src/display_itdb.c
+++ b/src/display_itdb.c
@@ -277,12 +277,9 @@ void gp_track_remove(Track *track) {
before when you make sure @track is no longer referenced in any
playlist -- see gp_playlist_remove_track for details */
void gp_track_unlink(Track *track) {
- g_message("TODO need to remove track from playlists and details window if
necessary");
- /* the details window may be accessing the tracks */
- // details_remove_track(track);
- g_message("TODO signal that any file conversions on track be cancelled");
+ gtkpod_track_removed(track);
/* cancel pending conversions */
- // file_convert_cancel_track(track);
+ file_convert_cancel_track(track);
/* remove from SHA1 hash */
sha1_track_remove(track);
/* remove from pc_path_hash */
diff --git a/src/display_sorttabs.c b/src/display_sorttabs.c
index 9d93bf0..3aa15da 100644
--- a/src/display_sorttabs.c
+++ b/src/display_sorttabs.c
@@ -64,6 +64,7 @@ static void sp_store_sp_entries(gint inst);
static void st_page_selected(GtkNotebook *notebook, guint page);
static void st_create_notebook(gint inst);
static TimeInfo *sp_update_date_interval_from_string(guint32 inst, T_item
item, gboolean force_update);
+void st_show_hide_tooltips(void);
/* Drag and drop definitions */
static GtkTargetEntry st_drag_types[] =
@@ -1786,14 +1787,7 @@ void st_sort(GtkSortType order) {
for (i = 0; i < prefs_get_int("sort_tab_num"); ++i)
st_sort_inst(i, order);
- /* Reset the cover images. Unfortunately the track order is not maintained
when the
- * display list of tracks is created. Thus, if the desired track order is
the original order
- * then unfortunately the tracks must be collected from the playlist once
again and the
- * displaytracks list in coverart recreated.
- * ie. easy to sort ascending and descending but difficult to return to
unsorted state
- */
- g_message("TODO: st_sort - signal coverart display to update itself");
- // coverart_display_update(order == SORT_NONE);
+ gtkpod_tracks_reordered();
}
gint st_get_sorttab_page_number(int inst) {
@@ -2288,47 +2282,6 @@ void st_show_visible(void) {
st_redisplay(0);
}
-/* set the paned positions for the visible sort tabs in the prefs
- * structure. This function is called when first creating the paned
- * elements and from within st_arrange_visible_sort_tabs() */
-static void st_set_visible_sort_tab_paned(void) {
- // gint i, x, y, p0, num, width;
-
- g_message("TODO: Determine whether to need to store the paned sizes and
positions anymore?");
- // num = prefs_get_int("sort_tab_num");
- // if (num > 0) {
- // gchar *buf;
- // GtkWidget *w;
- //
- // gtk_window_get_size(GTK_WINDOW (gtkpod_window), &x, &y);
- // buf = g_strdup_printf("paned%d", PANED_PLAYLIST);
- // if ((w = gtkpod_xml_get_widget(main_window_xml, buf))) {
- // p0 = gtk_paned_get_position(GTK_PANED (w));
- // width = (x - p0) / num;
- // for (i = 0; i < num; ++i) {
- // prefs_set_int_index("paned_pos_", PANED_NUM_GLADE + i,
width);
- // }
- // }
- // g_free(buf);
- // }
-}
-
-/* Regularly arrange the visible sort tabs */
-void st_arrange_visible_sort_tabs(void) {
- gint i, num;
-
- num = prefs_get_int("sort_tab_num");
- if (num > 0) {
- st_set_visible_sort_tab_paned();
- for (i = 0; i < num; ++i) {
- if (prefs_get_int_index("paned_pos_", PANED_NUM_GLADE + i) != -1) {
- if (st_paned[i])
- gtk_paned_set_position(st_paned[i],
prefs_get_int_index("paned_pos_", PANED_NUM_GLADE + i));
- }
- }
- }
-}
-
/* Created paned elements for sorttabs */
static void st_create_paned() {
gint i;
@@ -2355,11 +2308,6 @@ static void st_create_paned() {
st_paned[i] = GTK_PANED (paned);
}
-
- /* set position of visible paned to decent values if not already
- set */
- if (prefs_get_int_index("paned_pos_", PANED_NUM_GLADE) == -1)
- st_set_visible_sort_tab_paned();
}
static gboolean st_button_press_event(GtkWidget *w, GdkEventButton *e,
gpointer data) {
@@ -2758,6 +2706,8 @@ void st_create_tabs(GtkPaned *parent, gchar *glade_path) {
because the latter calls st_redisplay(0) which refers to the
playlist view which hasn't yet set up) */
st_adjust_visible();
+
+ st_show_hide_tooltips();
}
/* Clean up the memory used by sort tabs (program quit). */
@@ -2778,61 +2728,6 @@ void st_cleanup(void) {
g_free(glade_file_path);
}
-/* set the default sizes for the gtkpod main window according to prefs:
- position of the PANED_NUM GtkPaned elements (the width of the
- colums is set when setting up the colums in the listview. Called by
- display_set_default_sizes() */
-void st_set_default_sizes(void) {
- // gint i;
-
- /* GtkPaned elements */
- g_return_if_fail (gtkpod_app);
- g_message("TODO: Not sure whether to set positions of paneds based on
prefs");
- // /* Elements defined with glade */
- // for (i = 0; i < PANED_NUM_GLADE; ++i) {
- // gchar *buf = g_strdup_printf("paned%d", i);
- // GtkWidget *w = gtkpod_xml_get_widget(main_window_xml, buf);
- // g_free(buf);
- // g_return_if_fail (w);
- // if (prefs_get_int_index("paned_pos_", i) != -1) {
- // gtk_paned_set_position(GTK_PANED (w),
prefs_get_int_index("paned_pos_", i));
- // }
- // }
- // /* Elements defined with display.c (sort tab hpaned) */
- // for (i = 0; i < PANED_NUM_ST; ++i) {
- // g_return_if_fail (st_paned[i]);
- // if (prefs_get_int_index("paned_pos_", PANED_NUM_GLADE + i) !=
-1) {
- // gtk_paned_set_position(st_paned[i],
prefs_get_int_index("paned_pos_", PANED_NUM_GLADE + i));
- // }
- // }
-}
-
-/* update the cfg structure (preferences) with the current sizes /
- positions (called by display_update_default_sizes():
- position of GtkPaned elements */
-void st_update_default_sizes(void) {
- /* GtkPaned elements */
- g_message("TODO: Not sure whether need to update default size of
sorttabs");
- // if (gtkpod_window) {
- // gint i;
- // /* Elements defined with glade */
- // for (i = 0; i < PANED_NUM_GLADE; ++i) {
- // gchar *buf;
- // GtkWidget *w;
- // buf = g_strdup_printf("paned%d", i);
- // if ((w = gtkpod_xml_get_widget(main_window_xml, buf))) {
- // prefs_set_int_index("paned_pos_", i,
gtk_paned_get_position(GTK_PANED (w)));
- // }
- // g_free(buf);
- // }
- // /* Elements defined with display.c (sort tab hpaned) */
- // for (i = 0; i < PANED_NUM_ST; ++i) {
- // if (st_paned[i])
- // prefs_set_int_index("paned_pos_", i + PANED_NUM_GLADE,
gtk_paned_get_position(st_paned[i]));
- // }
- // }
-}
-
/* make the tooltips visible or hide it depending on the value set in
* the prefs (tooltips_main) (called by display_show_hide_tooltips() */
void st_show_hide_tooltips(void) {
@@ -2848,10 +2743,12 @@ void st_show_hide_tooltips(void) {
tt = ttd->tooltips;
g_return_if_fail (tt);
- if (prefs_get_int("display_tooltips_main"))
+ if (prefs_get_int("display_tooltips_main")) {
gtk_tooltips_enable(tt);
- else
+ }
+ else {
gtk_tooltips_disable(tt);
+ }
}
}
diff --git a/src/display_tracks.c b/src/display_tracks.c
index 8eb82cb..8543b0b 100644
--- a/src/display_tracks.c
+++ b/src/display_tracks.c
@@ -1210,6 +1210,7 @@ static void tm_cell_toggled(GtkCellRendererToggle
*renderer, gchar *arg1, gpoint
if ((column == TM_COLUMN_LYRICS) && (selected_tracks != NULL)) {
/* set displayed page to the lyrics page */
+ //FIXME
g_message("TODO - display_tracks: set displayed page to the lyrics
page in details window");
// prefs_set_int (DETAILS_WINDOW_NOTEBOOK_PAGE, 3);
// details_edit (selected_tracks);
@@ -2261,7 +2262,7 @@ static void tm_create_treeview(void) {
/* create tree view */
if (track_treeview) { /* delete old tree view */
model = gtk_tree_view_get_model(track_treeview);
- /* FIXME: how to delete model? */
+ g_object_unref(model);
gtk_widget_destroy(GTK_WIDGET (track_treeview));
}
track_treeview = GTK_TREE_VIEW (stv);
diff --git a/src/file.c b/src/file.c
index b5a5caa..7bdd163 100644
--- a/src/file.c
+++ b/src/file.c
@@ -1447,8 +1447,7 @@ void mserv_from_file_tracks(GList *selected_tracks) {
g_return_if_fail (etr);
buf = get_track_info(track, TRUE);
- g_message("TODO file:mserv_from_file_tracks - status needed\n");
- // gtkpod_statusbar_message (_("Retrieving mserv data %s"), buf);
+ gtkpod_statusbar_message (_("Retrieving mserv data %s"), buf);
g_free(buf);
if (etr->pc_path_locale && *etr->pc_path_locale)
update_mserv_data_from_file(etr->pc_path_locale, track);
diff --git a/src/file_convert.h b/src/file_convert.h
index 4a12987..d5067d2 100644
--- a/src/file_convert.h
+++ b/src/file_convert.h
@@ -36,7 +36,7 @@
# include <config.h>
#endif
-#include <itdb.h>
+#include "itdb.h"
#include "file_convert_info.h"
extern const gchar *FILE_CONVERT_CACHEDIR;
diff --git a/src/file_export.c b/src/file_export.c
index ca8f2e6..60a2a2b 100644
--- a/src/file_export.c
+++ b/src/file_export.c
@@ -500,7 +500,6 @@ static void export_files_store_option_settings(struct fcd
*fcd) {
******************************************************************/
void export_tracks_as_files(GList *tracks, GList **filenames, gboolean
display, gchar *message) {
- g_message("Copying tracks to file");
gint response;
GtkWidget *win, *options, *message_box;
struct fcd *fcd;
diff --git a/src/file_itunesdb.c b/src/file_itunesdb.c
index e6921c5..4f7bac3 100644
--- a/src/file_itunesdb.c
+++ b/src/file_itunesdb.c
@@ -121,10 +121,9 @@ void fill_in_extended_info(Track *track, gint32 total,
gint32 num) {
sei = g_hash_table_lookup(extendedinfohash, &ipod_id);
}
if (!sei && extendedinfohash_sha1) {
- g_message("TODO - file_itunesdb:fill_in_extended_info. status\n");
- // gtkpod_statusbar_message (
- // _("Matching SHA1 checksum for file %d/%d"),
- // num, total);
+ gtkpod_statusbar_message (
+ _("Matching SHA1 checksum for file %d/%d"),
+ num, total);
while (widgets_blocked && gtk_events_pending())
gtk_main_iteration();
@@ -971,7 +970,7 @@ gboolean gp_eject_ipod(iTunesDB *itdb) {
* return value: TRUE on succes, FALSE when an error occurred.
*/
gboolean gp_save_itdb(iTunesDB *itdb) {
- // Playlist *pl;
+ Playlist *pl;
gboolean success;
g_return_val_if_fail (itdb, FALSE);
@@ -981,11 +980,10 @@ gboolean gp_save_itdb(iTunesDB *itdb) {
/* update smart playlists before writing */
itdb_spl_update_live(itdb);
- g_message("TODO - update smart playlists before writing\n");
- // pl = pm_get_selected_playlist();
- // if (pl && (pl->itdb == itdb) && pl->is_spl &&
pl->splpref.liveupdate) { /* Update display if necessary */
- // st_redisplay(0);
- // }
+ pl = gtkpod_get_current_playlist();
+ if (pl && (pl->itdb == itdb) && pl->is_spl && pl->splpref.liveupdate) { /*
Update display if necessary */
+ gtkpod_set_current_playlist(pl);
+ }
success = gp_write_itdb(itdb);
diff --git a/src/gtkpod.c b/src/gtkpod.c
index bda4f87..e9f6154 100644
--- a/src/gtkpod.c
+++ b/src/gtkpod.c
@@ -207,7 +207,7 @@ static gboolean on_gtkpod_delete_event(GtkWidget *widget,
GdkEvent *event, gpoin
anjuta_profile_sync(current_profile, NULL);
/*
- * Workaround - FIXME
+ * Workaround
* Seems that when the plugins are unloaded in the last line below, the
changed
* signal is emitted onto the current_profile, which has the effect of
wiping the
* user profile. This line avoids this by setting the profile file to
null. Anjuta does
diff --git a/src/misc.c b/src/misc.c
index 409de17..5e0b167 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -1772,12 +1772,6 @@ void gtkpod_shutdown() {
/* stop accepting requests for playcount updates */
server_shutdown();
- g_message("TODO - cleanup gphoto_window on shutdown");
- /* Change the windows back to track view to ensure the
- * sorttab state is saved correctly/
- */
- //gphoto_change_to_photo_window (FALSE);
-
/* shut down conversion infrastructure */
file_convert_shutdown();
diff --git a/src/misc_playlist.c b/src/misc_playlist.c
index 2f3be38..83dc050 100644
--- a/src/misc_playlist.c
+++ b/src/misc_playlist.c
@@ -75,8 +75,7 @@ Playlist *add_new_pl_user_name(iTunesDB *itdb, gchar *dflt,
gint32 position) {
= get_user_string(_("New Playlist"), _("Please enter a name for
the new playlist"), dflt ? dflt : _("New Playlist"), NULL, NULL, GTK_STOCK_ADD);
if (name) {
result = gp_playlist_add_new(itdb, name, FALSE, position);
- g_message("TODO add_new_playlist_user_name - status\n");
- // gtkpod_tracks_statusbar_update ();
+ gtkpod_tracks_statusbar_update ();
}
return result;
}
@@ -790,8 +789,7 @@ static void check_db_danglingok1(gpointer user_data1,
gpointer user_data2) {
/* printf("Handling track %d\n", track->ipod_id); */
buf = get_track_info(track, TRUE);
- g_message("TODO check_db_danglingok1- status\n");
- // gtkpod_statusbar_message (_("Processing '%s'..."), buf);
+ gtkpod_statusbar_message (_("Processing '%s'..."), buf);
g_free(buf);
while (widgets_blocked && gtk_events_pending())
diff --git a/src/misc_track.c b/src/misc_track.c
index 1be73a3..3a01ce0 100644
--- a/src/misc_track.c
+++ b/src/misc_track.c
@@ -189,23 +189,22 @@ void gp_duplicate_remove(Track *oldtrack, Track *track) {
"The following %d duplicate tracks have not
been added to the master play list.",
deltrack_nr), deltrack_nr);
}
- g_message("TODO misc_track:gp_duplicate_remove - return status\n");
- // gtkpod_confirmation
- // (-1, /* gint id, */
- // FALSE, /* gboolean modal, */
- // _("Duplicate detection"),/* title */
- // buf, /* label */
- // str->str, /* scrolled text */
- // NULL, 0, NULL, /* option 1 */
- // NULL, 0, NULL, /* option 2 */
- // TRUE, /* gboolean confirm_again, */
- // "show_duplicates",
- // /* ConfHandlerCA
confirm_again_handler,*/
- // CONF_NULL_HANDLER, /* ConfHandler ok_handler,*/
- // NULL, /* don't show "Apply" button */
- // NULL, /* don't show "Cancel" button */
- // NULL, /* gpointer user_data1,*/
- // NULL); /* gpointer user_data2,*/
+ gtkpod_confirmation
+ (-1, /* gint id, */
+ FALSE, /* gboolean modal, */
+ _("Duplicate detection"),/* title */
+ buf, /* label */
+ str->str, /* scrolled text */
+ NULL, 0, NULL, /* option 1 */
+ NULL, 0, NULL, /* option 2 */
+ TRUE, /* gboolean confirm_again, */
+ "show_duplicates",
+ /* ConfHandlerCA confirm_again_handler,*/
+ CONF_NULL_HANDLER, /* ConfHandler ok_handler,*/
+ NULL, /* don't show "Apply" button */
+ NULL, /* don't show "Cancel" button */
+ NULL, /* gpointer user_data1,*/
+ NULL); /* gpointer user_data2,*/
g_free(buf);
}
}
diff --git a/src/sha1.c b/src/sha1.c
index acfe76a..3623184 100644
--- a/src/sha1.c
+++ b/src/sha1.c
@@ -93,7 +93,6 @@ void setup_sha1()
{
struct itdbs_head *itdbs_head;
- g_message("TODO find other way of getting itdbs_head\n");
itdbs_head = gp_get_itdbs_head();
/* gets called before itdbs are set up -> fail silently */
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
