commit a207bee0a6bbb567d05d7116f8c0abd9e64f5ce6
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Sat Jun 19 01:20:26 2010 +0100
Minor tweaks and tidy ups
plugins/cover_display/plugin.c | 9 +++++++++
src/details.c | 4 ----
src/display_coverart.c | 19 ++++++++-----------
src/display_coverart.h | 3 +--
src/misc_playlist.c | 3 +--
src/prefs.c | 3 ---
src/prefs.h | 3 ++-
7 files changed, 21 insertions(+), 23 deletions(-)
---
diff --git a/plugins/cover_display/plugin.c b/plugins/cover_display/plugin.c
index 16ffd8a..33643fa 100644
--- a/plugins/cover_display/plugin.c
+++ b/plugins/cover_display/plugin.c
@@ -90,6 +90,7 @@ static gboolean activate_plugin(AnjutaPlugin *plugin) {
coverart_init_display(cover_display_plugin->cover_window);
anjuta_shell_add_widget(plugin->shell, cover_display_plugin->cover_window,
"CoverDisplayPlugin", "Cover Artwork", NULL, ANJUTA_SHELL_PLACEMENT_CENTER,
NULL);
+ coverart_block_change(FALSE);
coverart_display_update(TRUE);
return TRUE; /* FALSE if activation failed */
@@ -99,6 +100,14 @@ static gboolean deactivate_plugin(AnjutaPlugin *plugin) {
AnjutaUI *ui;
CoverDisplayPlugin *cover_display_plugin;
+ coverart_block_change(TRUE);
+
+ g_signal_handlers_disconnect_by_func(plugin->shell, G_CALLBACK
(coverart_display_update_cb), plugin);
+ g_signal_handlers_disconnect_by_func(plugin->shell, G_CALLBACK
(coverart_display_track_removed_cb), plugin);
+ g_signal_handlers_disconnect_by_func(plugin->shell, G_CALLBACK
(coverart_display_set_tracks_cb), plugin);
+ g_signal_handlers_disconnect_by_func(plugin->shell, G_CALLBACK
(coverart_display_track_updated_cb), plugin);
+ g_signal_handlers_disconnect_by_func(plugin->shell, G_CALLBACK
(coverart_display_track_added_cb), plugin);
+
cover_display_plugin = (CoverDisplayPlugin*) plugin;
ui = anjuta_shell_get_ui(plugin->shell, NULL);
diff --git a/src/details.c b/src/details.c
index 0735ba8..d89539a 100644
--- a/src/details.c
+++ b/src/details.c
@@ -1656,9 +1656,6 @@ static void dnd_details_art_drag_data_received(GtkWidget
*widget, GdkDragContext
/* assign details window as the parent window so the file exists
dialog is
* properly centred and visible if a file has to be overwritten
*/
- fcover->parent_window = GTK_WINDOW(details_view->window);
- coverart_block_change (TRUE);
-
if (fetchcover_net_retrieve_image (fcover))
{
#if DEBUG
@@ -1676,7 +1673,6 @@ static void dnd_details_art_drag_data_received(GtkWidget
*widget, GdkDragContext
image_error = g_strdup(fcover->err_msg);
free_fetchcover (fcover);
- coverart_block_change (FALSE);
#else
image_error = "Item had to be downloaded but gtkpod was not compiled
with curl.";
image_status = FALSE;
diff --git a/src/display_coverart.c b/src/display_coverart.c
index 6121cc3..b460ebe 100644
--- a/src/display_coverart.c
+++ b/src/display_coverart.c
@@ -160,9 +160,8 @@ static gboolean coverart_window_valid() {
*
* Initialise the boxes and canvases of the coverart_display.
*
- * return: cover panel for addition to window.
*/
-GtkWidget *coverart_init_display(GtkWidget *parent) {
+void coverart_init_display(GtkWidget *parent) {
GtkWidget *cover_temp_window;
DEFAULT_FILE = g_build_filename(GTKPOD_IMAGE_DIR, "default-cover.png",
NULL);
@@ -182,13 +181,13 @@ GtkWidget *coverart_init_display(GtkWidget *parent) {
cdwidget->draw_area = gtk_drawing_area_new();
cdwidget->cdcovers = g_ptr_array_sized_new(IMG_TOTAL);
- g_return_val_if_fail (cdwidget->contentpanel, NULL);
- g_return_val_if_fail (cdwidget->canvasbox, NULL);
- g_return_val_if_fail (cdwidget->controlbox, NULL);
- g_return_val_if_fail (cdwidget->leftbutton, NULL);
- g_return_val_if_fail (cdwidget->rightbutton, NULL);
- g_return_val_if_fail (cdwidget->cdslider, NULL);
- g_return_val_if_fail (cdwidget->draw_area, NULL);
+ g_return_if_fail (cdwidget->contentpanel);
+ g_return_if_fail (cdwidget->canvasbox);
+ g_return_if_fail (cdwidget->controlbox);
+ g_return_if_fail (cdwidget->leftbutton);
+ g_return_if_fail (cdwidget->rightbutton);
+ g_return_if_fail (cdwidget->cdslider);
+ g_return_if_fail (cdwidget->draw_area);
/* according to GTK FAQ: move a widget to a new parent */
gtk_widget_ref(cdwidget->contentpanel);
gtk_container_remove(GTK_CONTAINER (cover_temp_window),
cdwidget->contentpanel);
@@ -254,8 +253,6 @@ GtkWidget *coverart_init_display(GtkWidget *parent) {
gtk_widget_show_all(parent);
coverart_block_change(FALSE);
-
- return cdwidget->contentpanel;
}
/**
diff --git a/src/display_coverart.h b/src/display_coverart.h
index 4567ca8..5e10336 100644
--- a/src/display_coverart.h
+++ b/src/display_coverart.h
@@ -90,9 +90,8 @@ extern const gchar *DISPLAY_COVER_SHOW;
*
* Initialise the boxes and canvases of the coverart_display.
*
- * return: cover panel for addition to window.
*/
-GtkWidget *coverart_init_display(GtkWidget *parent);
+void coverart_init_display(GtkWidget *parent);
/**
* coverart_display_update:
diff --git a/src/misc_playlist.c b/src/misc_playlist.c
index b6e1a9a..2f3be38 100644
--- a/src/misc_playlist.c
+++ b/src/misc_playlist.c
@@ -107,8 +107,7 @@ void add_new_pl_or_spl_user_name(iTunesDB *itdb, gchar
*dflt, gint32 position) {
if (name) {
if (!is_spl) { /* add standard playlist */
gp_playlist_add_new(itdb, name, FALSE, position);
- g_message("TODO add_new_pl_or_spl_username - status\n");
- // gtkpod_tracks_statusbar_update ();
+ gtkpod_tracks_statusbar_update ();
}
else { /* add smart playlist */
spl_edit_new(itdb, name, position);
diff --git a/src/prefs.c b/src/prefs.c
index f280408..fd6c573 100644
--- a/src/prefs.c
+++ b/src/prefs.c
@@ -105,9 +105,6 @@ const gchar *KEY_MANUAL_SYNCDIR = "manual_syncdir";
* Data global to this module only
*/
-/* End-of-list marker for variable-length lists */
-#define LIST_END_MARKER "----++++----"
-
struct temp_prefs_save {
GIOChannel *gio;
GError **error;
diff --git a/src/prefs.h b/src/prefs.h
index 78f6454..beb7c6b 100644
--- a/src/prefs.h
+++ b/src/prefs.h
@@ -36,7 +36,8 @@
#include <gtk/gtk.h>
-
+/* 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 */
------------------------------------------------------------------------------
ThinkGeek and WIRED's GeekDad team up for the Ultimate
GeekDad Father's Day Giveaway. ONE MASSIVE PRIZE to the
lucky parental unit. See the prize list and enter to win:
http://p.sf.net/sfu/thinkgeek-promo
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
