Mercurial > audlegacy
changeset 2656:f6c8622ef240 trunk
[svn] - fixed c++ish declaration in a c file (part 3)
| author | giacomo |
|---|---|
| date | Sat, 07 Apr 2007 05:08:36 -0700 |
| parents | 46278877a39b |
| children | dd5f6197e18f |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/ui_fileinfopopup.c |
| diffstat | 3 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Apr 07 04:56:27 2007 -0700 +++ b/ChangeLog Sat Apr 07 05:08:36 2007 -0700 @@ -1,3 +1,10 @@ +2007-04-07 11:56:27 +0000 Giacomo Lozito <james@develia.org> + revision [4336] + - fixed c++ish declaration in a c file (part 2) + trunk/src/audacious/controlsocket.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + + 2007-04-07 11:36:14 +0000 Giacomo Lozito <james@develia.org> revision [4334] - fixed c++ish declaration in a c file
--- a/src/audacious/build_stamp.c Sat Apr 07 04:56:27 2007 -0700 +++ b/src/audacious/build_stamp.c Sat Apr 07 05:08:36 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070407-4334"; +const gchar *svn_stamp = "20070407-4336";
--- a/src/audacious/ui_fileinfopopup.c Sat Apr 07 04:56:27 2007 -0700 +++ b/src/audacious/ui_fileinfopopup.c Sat Apr 07 05:08:36 2007 -0700 @@ -297,9 +297,10 @@ void audacious_fileinfopopup_destroy(GtkWidget *filepopup_win) { + gchar *last_artwork; audacious_fileinfopopup_progress_stop(filepopup_win); - gchar *last_artwork = + last_artwork = g_object_get_data(G_OBJECT(filepopup_win), "last_artwork"); if (last_artwork != NULL) g_free(last_artwork); @@ -332,8 +333,10 @@ { gchar *tmp = NULL; gint x, y, x_off = 3, y_off = 3, h, w; + gchar *length_string, *year_string, *track_string; + gchar *last_artwork; - gchar *last_artwork = + last_artwork = g_object_get_data(G_OBJECT(filepopup_win), "last_artwork"); const static gchar default_artwork[] = DATA_DIR "/images/audio.png"; @@ -379,7 +382,7 @@ audacious_fileinfopupup_update_data(filepopup_win, tuple->genre, "label_genre", "header_genre"); - gchar *length_string = (tuple->length > 0) ? + length_string = (tuple->length > 0) ? g_strdup_printf("%d:%02d", tuple->length / 60000, (tuple->length / 1000) % 60) : NULL; audacious_fileinfopupup_update_data(filepopup_win, length_string, "label_tracklen", "header_tracklen"); @@ -390,12 +393,12 @@ else g_object_set_data( G_OBJECT(filepopup_win), "length" , GINT_TO_POINTER(-1) ); - gchar *year_string = (tuple->year == 0) ? NULL : g_strdup_printf("%d", tuple->year); + year_string = (tuple->year == 0) ? NULL : g_strdup_printf("%d", tuple->year); audacious_fileinfopupup_update_data(filepopup_win, year_string, "label_year", "header_year"); g_free(year_string); - gchar *track_string = (tuple->track_number == 0) ? NULL : g_strdup_printf("%d", tuple->track_number); + track_string = (tuple->track_number == 0) ? NULL : g_strdup_printf("%d", tuple->track_number); audacious_fileinfopupup_update_data(filepopup_win, track_string, "label_tracknum", "header_tracknum"); g_free(track_string);