GNOME Bugzilla – Bug 571557
Migrate from deprecated GNOME_STOCK_* buttons to GTK_STOCK_* buttons
Last modified: 2009-10-22 03:26:17 UTC
These buttons are deprecated and should be replaced by the corresponding ones in GTK+: http://library.gnome.org/devel/libgnomeui/stable/GnomeDialog.html#GNOME-STOCK-BUTTON-CANCEL:CAPS http://library.gnome.org/devel/libgnomeui/stable/GnomeDialog.html#GNOME-STOCK-BUTTON-OK:CAPS http://library.gnome.org/devel/libgnomeui/stable/libgnomeui-gnome-stock-icons.html#GNOME-STOCK-MENU-ABOUT:CAPS http://library.gnome.org/devel/libgnomeui/stable/libgnomeui-gnome-stock-icons.html#GNOME-STOCK-MENU-BLANK:CAPS http://library.gnome.org/devel/libgnomeui/stable/libgnomeui-gnome-stock-icons.html#GNOME-STOCK-MENU-PREF:CAPS http://library.gnome.org/devel/libgnomeui/stable/libgnomeui-gnome-stock-icons.html#GNOME-STOCK-MENU-QUIT:CAPS ./gnome-pilot/gpilotd/gpilot-gui.c: dialogWindow = gnome_message_box_new(tmp,type,GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilotd/gpilot-gui.c: dialogWindow = gnome_message_box_new(tmp,type,GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/applet/pilot.c: GNOME_STOCK_BUTTON_CANCEL, ./gnome-pilot/applet/pilot.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/applet/pilot.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/applet/pilot.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK, ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_CANCEL, ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_CANCEL,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_CANCEL,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_STOCK_BUTTON_OK,NULL); ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_ABOUT, ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_BLANK,/*FIXME: reasonable pixmap*/ ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_BLANK,/*FIXME: reasonable pixmap*/ ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_APP_PIXMAP_STOCK,GNOME_STOCK_MENU_PREF, ./gnome-pilot/gpilot-fileman/fileman.c: GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_QUIT, ./gnome-pilot/conduits/file/gpilot_install_file.c: GNOME_STOCK_BUTTON_OK, NULL); ./gnome-pilot/conduits/file/gpilot_install_file.c: GNOME_STOCK_BUTTON_CANCEL,
Newbie here... Am I right that I'm supposed to submit 4 patches, one for each affected file? (I've never used diff before, so bear with me...)
Chris, it's perfectly acceptable (preferable, in fact) to provide a single diff if you are fixing a single bug. If you are fixing several bugs, it's best to provide independent diffs if possible. I use "diff -Naur old new" to provide a 'unified' style diff that compares "old" directory with "new" and recurses through the subdirectories.
Created attachment 132662 [details] [review] specified GNOME macros changed to GTK This a comparison of directories 'old' and 'new', each with a pair of directories 'gnome-pilot' and 'gnome-pilot-conduits' within it. As I downloaded the 'old' copy sometime after downloading and modifying the 'new' copy, I hope the repositories didn't change in between.
Chris, Sorry for the long delay. I only just got around to looking at your patch. First of all, the easiest way to generate a patch is to use "svn diff". Now that we've migrated to using "git" you should use "git diff". Your patch file included a bunch of stuff from the "svn" internal files which bloated the file and weren't relevant. Secondly, did you manage to compile gnome-pilot after applying your changes? I suspect not, as "GTK_STOCK_BUTTON_OK" is not recognised by gnome-message-box. We actually need to migrate gnome-message-box to use GtkMessageDialog instead, so there's a bit more work to do.
(In reply to comment #4) > Now that we've migrated to using "git" you should use "git diff". Actually "git format-patch HEAD^" is even more sexy after locally running "git commit". See http://live.gnome.org/Git/Developers
migration to GtkMessageDialog done (2009-08-25)
No, I didn't download and compile all of GTK... I didn't know I would need to for such a small problem. Sorry I didn't see your replies in my inbox until now. Glad the problem is fixed though.