Update of /cvsroot/gtkpod/gtkpod/src
In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv32725/src
Modified Files:
context_menus.c misc_confirm.c
Log Message:
* src/confirmation.c: Add safety to "remove all tracks"
context menu.
Index: context_menus.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/context_menus.c,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- context_menus.c 23 Jun 2006 16:03:05 -0000 1.65
+++ context_menus.c 29 Jun 2006 11:46:16 -0000 1.66
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-23 23:33:50 jcs>
+/* Time-stamp: <2006-06-29 20:41:31 jcs>
|
| Copyright (C) 2003 Corey Donohoe <atmos at atmos dot org>
| Copyright (C) 2003-2005 Jorg Schuler <jcsjcs at users sourceforge net>
@@ -418,18 +418,38 @@
static GtkWidget *add_remove_all_tracks_from_ipod (GtkWidget *menu)
{
- return hookup_mi (menu, _("Remove All Tracks from iPod"),
- GTK_STOCK_DELETE,
- G_CALLBACK (delete_entries),
- GINT_TO_POINTER (DELETE_ACTION_IPOD));
+ GtkWidget *mi;
+ GtkWidget *sub;
+
+ mi = hookup_mi (menu, _("Remove All Tracks from iPod"),
+ GTK_STOCK_DELETE,
+ NULL, NULL);
+ sub = gtk_menu_new ();
+ gtk_widget_show (sub);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), sub);
+ hookup_mi (sub, _("I'm sure"),
+ NULL,
+ G_CALLBACK (delete_entries),
+ GINT_TO_POINTER (DELETE_ACTION_IPOD));
+ return mi;
}
static GtkWidget *add_remove_all_podcasts_from_ipod (GtkWidget *menu)
{
- return hookup_mi (menu, _("Remove All Podcasts from iPod"),
- GTK_STOCK_DELETE,
- G_CALLBACK (delete_entries),
- GINT_TO_POINTER (DELETE_ACTION_IPOD));
+ GtkWidget *mi;
+ GtkWidget *sub;
+
+ mi = hookup_mi (menu, _("Remove All Podcasts from iPod"),
+ GTK_STOCK_DELETE,
+ NULL, NULL);
+ sub = gtk_menu_new ();
+ gtk_widget_show (sub);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), sub);
+ hookup_mi (sub, _("I'm sure"),
+ NULL,
+ G_CALLBACK (delete_entries),
+ GINT_TO_POINTER (DELETE_ACTION_IPOD));
+ return mi;
}
static GtkWidget *add_delete_including_tracks (GtkWidget *menu)
@@ -491,10 +511,20 @@
static GtkWidget *add_remove_all_tracks_from_database (GtkWidget *menu)
{
- return hookup_mi (menu, _("Remove All Tracks from Database"),
- GTK_STOCK_DELETE,
- G_CALLBACK (delete_entries),
- GINT_TO_POINTER (DELETE_ACTION_DATABASE));
+ GtkWidget *mi;
+ GtkWidget *sub;
+
+ mi = hookup_mi (menu, _("Remove All Tracks from Database"),
+ GTK_STOCK_DELETE,
+ NULL, NULL);
+ sub = gtk_menu_new ();
+ gtk_widget_show (sub);
+ gtk_menu_item_set_submenu (GTK_MENU_ITEM (mi), sub);
+ hookup_mi (sub, _("I'm sure"),
+ NULL,
+ G_CALLBACK (delete_entries),
+ GINT_TO_POINTER (DELETE_ACTION_DATABASE));
+ return mi;
}
static GtkWidget *add_delete_including_tracks_harddisk (GtkWidget *menu)
Index: misc_confirm.c
===================================================================
RCS file: /cvsroot/gtkpod/gtkpod/src/misc_confirm.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- misc_confirm.c 26 Jun 2006 23:58:17 -0000 1.41
+++ misc_confirm.c 29 Jun 2006 11:46:16 -0000 1.42
@@ -1,4 +1,4 @@
-/* Time-stamp: <2006-06-24 20:55:39 jcs>
+/* Time-stamp: <2006-06-29 20:44:06 jcs>
|
| Copyright (C) 2002-2005 Jorg Schuler <jcsjcs at users sourceforge net>
| Part of the gtkpod project.
@@ -660,7 +660,6 @@
Playlist *pl;
iTunesDB *itdb;
GtkResponseType response = GTK_RESPONSE_NONE;
- GString *str;
gchar *label = NULL, *title = NULL;
gboolean confirm_again;
gchar *confirm_again_key;
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
