Mercurial > audlegacy
changeset 2658:4b8db8c0521d trunk
[svn] - fixed c++ish declaration in a c file (part 5)
| author | giacomo |
|---|---|
| date | Sat, 07 Apr 2007 05:25:22 -0700 |
| parents | dd5f6197e18f |
| children | e3f584bba3be |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/ui_fileopener.c |
| diffstat | 3 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Apr 07 05:15:25 2007 -0700 +++ b/ChangeLog Sat Apr 07 05:25:22 2007 -0700 @@ -1,3 +1,10 @@ +2007-04-07 12:15:25 +0000 Giacomo Lozito <james@develia.org> + revision [4340] + - fixed c++ish declaration in a c file (part 4) + trunk/src/audacious/ui_fileinfopopup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + + 2007-04-07 12:08:36 +0000 Giacomo Lozito <james@develia.org> revision [4338] - fixed c++ish declaration in a c file (part 3)
--- a/src/audacious/build_stamp.c Sat Apr 07 05:15:25 2007 -0700 +++ b/src/audacious/build_stamp.c Sat Apr 07 05:25:22 2007 -0700 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070407-4338"; +const gchar *svn_stamp = "20070407-4340";
--- a/src/audacious/ui_fileopener.c Sat Apr 07 05:15:25 2007 -0700 +++ b/src/audacious/ui_fileopener.c Sat Apr 07 05:25:22 2007 -0700 @@ -65,14 +65,14 @@ GtkWidget *window = g_object_get_data(data, "window"); GtkWidget *chooser = g_object_get_data(data, "chooser"); GtkWidget *toggle = g_object_get_data(data, "toggle-button"); + gboolean play_button; + GSList *files; cfg.close_dialog_open = gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(toggle)); - gboolean play_button = + play_button = GPOINTER_TO_INT(g_object_get_data(data, "play-button")); - - GSList *files; files = gtk_file_chooser_get_filenames(GTK_FILE_CHOOSER(chooser)); if (!files) return; @@ -118,16 +118,18 @@ GtkWidget *chooser; GtkWidget *action_button, *close_button; GtkWidget *toggle; + gchar *window_title, *toggle_text; + gpointer action_stock, storage; if(window) { gtk_window_present(GTK_WINDOW(window)); /* raise filebrowser */ return; } - gchar *window_title = play_button ? _("Open Files") : _("Add Files"); - gchar *toggle_text = play_button ? + window_title = play_button ? _("Open Files") : _("Add Files"); + toggle_text = play_button ? _("Close dialog on Open") : _("Close dialog on Add"); - gpointer action_stock = play_button ? GTK_STOCK_OPEN : GTK_STOCK_ADD; + action_stock = play_button ? GTK_STOCK_OPEN : GTK_STOCK_ADD; window = gtk_window_new(GTK_WINDOW_TOPLEVEL); gtk_window_set_title(GTK_WINDOW(window), window_title); @@ -166,7 +168,7 @@ /* this storage object holds several other objects which are used in the * callback functions */ - gpointer storage = g_object_new(G_TYPE_OBJECT, NULL); + storage = g_object_new(G_TYPE_OBJECT, NULL); g_object_set_data(storage, "window", window); g_object_set_data(storage, "chooser", chooser); g_object_set_data(storage, "toggle-button", toggle);