GNOME Bugzilla – Bug 171664
[PATCH] libgnome/gnome-i18n.h is deprecated and GNOME_STOCK_ABOUT too
Last modified: 2005-11-27 12:30:41 UTC
Please describe the problem: Index: drw-break-window.c =================================================================== RCS file: /cvs/gnome/gnome-control-center/typing-break/drw-break-window.c,v retrieving revision 1.7 diff -u -r1.7 drw-break-window.c --- drw-break-window.c 13 Oct 2004 23:39:47 -0000 1.7 +++ drw-break-window.c 26 Mar 2005 00:08:41 -0000 @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <gconf/gconf-client.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include "drwright.h" #include "drw-utils.h" #include "drw-break-window.h" Index: drwright.c =================================================================== RCS file: /cvs/gnome/gnome-control-center/typing-break/drwright.c,v retrieving revision 1.11 diff -u -r1.11 drwright.c --- drwright.c 3 Feb 2005 23:23:59 -0000 1.11 +++ drwright.c 26 Mar 2005 00:08:42 -0000 @@ -24,12 +24,10 @@ #include <time.h> #include <string.h> #include <math.h> +#include <glib/gi18n.h> #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomeui/gnome-stock-icons.h> -#include <libgnomeui/gnome-client.h> -#include <libgnome/gnome-i18n.h> #include <gconf/gconf-client.h> #include "drwright.h" #include "drw-break-window.h" @@ -134,7 +132,7 @@ static GtkItemFactoryEntry popup_items[] = { /* { N_("/_Enabled"), NULL, GIF_CB (popup_enabled_cb), POPUP_ITEM_ENABLED, "<ToggleItem>", NULL },*/ { N_("/_Preferences"), NULL, GIF_CB (popup_preferences_cb), 0, "<StockItem>", GTK_STOCK_PREFERENCES }, - { N_("/_About"), NULL, GIF_CB (popup_about_cb), 0, "<StockItem>", GNOME_STOCK_ABOUT }, + { N_("/_About"), NULL, GIF_CB (popup_about_cb), 0, "<StockItem>", GTK_STOCK_ABOUT }, { "/sep1", NULL, NULL, 0, "<Separator>", NULL }, { N_("/_Take a Break"), NULL, GIF_CB (popup_break_cb), POPUP_ITEM_BREAK, "<Item>", NULL } }; Index: main.c =================================================================== RCS file: /cvs/gnome/gnome-control-center/typing-break/main.c,v retrieving revision 1.5 diff -u -r1.5 main.c --- main.c 3 Feb 2005 23:07:58 -0000 1.5 +++ main.c 26 Mar 2005 00:08:43 -0000 @@ -23,8 +23,7 @@ #include <string.h> #include <gdk/gdkx.h> #include <gtk/gtk.h> -#include <libgnomeui/libgnomeui.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include "drw-selection.h" #include "drwright.h" @@ -58,7 +57,7 @@ gboolean no_check = FALSE; bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR); - bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); + bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); textdomain (GETTEXT_PACKAGE); i = 1; @@ -80,8 +79,7 @@ ++i; } - gnome_program_init (PACKAGE, VERSION, LIBGNOMEUI_MODULE, - argc, argv, NULL); + gtk_init (&argc, &argv); selection = drw_selection_start (); if (!drw_selection_is_master (selection)) { Steps to reproduce: 1. 2. 3. Actual results: Expected results: Does this happen every time? Other information:
running as + gtk_init (&argc, &argv); will break help so it is not correct
Well, there is not much point in this patch really but feel free to commit once the module has been branched for 2.12. Except the gtk_init part of course :)
And please fix the indentation problem in main.c too :-) We have branched btw.
Index: drw-break-window.c =================================================================== RCS file: /cvs/gnome/gnome-control-center/typing-break/drw-break-window.c,v retrieving revision 1.7 diff -u -r1.7 drw-break-window.c --- drw-break-window.c 13 Oct 2004 23:39:47 -0000 1.7 +++ drw-break-window.c 26 Mar 2005 00:08:41 -0000 @@ -26,7 +26,7 @@ #include <gtk/gtk.h> #include <gdk/gdkkeysyms.h> #include <gconf/gconf-client.h> -#include <libgnome/gnome-i18n.h> +#include <glib/gi18n.h> #include "drwright.h" #include "drw-utils.h" #include "drw-break-window.h" Index: drwright.c =================================================================== RCS file: /cvs/gnome/gnome-control-center/typing-break/drwright.c,v retrieving revision 1.11 diff -u -r1.11 drwright.c --- drwright.c 3 Feb 2005 23:23:59 -0000 1.11 +++ drwright.c 26 Mar 2005 00:08:42 -0000 @@ -24,12 +24,10 @@ #include <time.h> #include <string.h> #include <math.h> +#include <glib/gi18n.h> #include <gdk/gdk.h> #include <gdk/gdkkeysyms.h> #include <gtk/gtk.h> -#include <libgnomeui/gnome-stock-icons.h> -#include <libgnomeui/gnome-client.h> -#include <libgnome/gnome-i18n.h> #include <gconf/gconf-client.h> #include "drwright.h" #include "drw-break-window.h" @@ -134,7 +132,7 @@ static GtkItemFactoryEntry popup_items[] = { /* { N_("/_Enabled"), NULL, GIF_CB (popup_enabled_cb), POPUP_ITEM_ENABLED, "<ToggleItem>", NULL },*/ { N_("/_Preferences"), NULL, GIF_CB (popup_preferences_cb), 0, "<StockItem>", GTK_STOCK_PREFERENCES }, - { N_("/_About"), NULL, GIF_CB (popup_about_cb), 0, "<StockItem>", GNOME_STOCK_ABOUT }, + { N_("/_About"), NULL, GIF_CB (popup_about_cb), 0, "<StockItem>", GTK_STOCK_ABOUT }, { "/sep1", NULL, NULL, 0, "<Separator>", NULL }, { N_("/_Take a Break"), NULL, GIF_CB (popup_break_cb), POPUP_ITEM_BREAK, "<Item>", NULL } };
could you attach that as a file? comment are not listed as patch by the bugzilla tools
Created attachment 49847 [details] [review] cleanup
Has this been committed yet? Otherwise feel free to do so.
Looks like parts of it was, I fixed the rest and committed.