Re: CVS-1-27 compile error explained

[Nathan Fredrickson <nathan silverorange com>]

On Sat, 2005-29-01 at 22:59 -0500, Nathan Fredrickson wrote:
> On Sat, 2005-29-01 at 17:38 -0500, Dan Williams wrote:
> > Well, I decided to try not to use deprecated functions, and since a number 
> > of the gnome guys here at work have been trying to get rid of libgnomeui 
> > (for good reason), it seems this one has gone away.  I'll have to ask 
> > around what the replacement for it is.
> 
> The replacement is gtk_window_set_default_icon_from_file().  This was
> the panel-applet's only dependency on libgnomeui, so the #include can be
> removed too.  Patch attached.
> 
> The only remaining dependency on libgnomeui is gnome-password-dialog in
> info-daemon/NetworkManagerInfoVPN.c, but that's not deprecated yet.

The second problem Bill reported, the missing _(), is due to
libgnome/gnome-i18n.h being deprecated.  Before being deprecated, this
file included bonobo/bonobo-i18n.h, which defined _().  I believe
glib/gi18n.h can be used instead.

The attached patch replaces my earlier patch and fixes both of the
issues Bill reported.

-- 
Nathan

Index: panel-applet/NMWirelessApplet.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/panel-applet/NMWirelessApplet.c,v
retrieving revision 1.59
diff -u -p -r1.59 NMWirelessApplet.c
--- panel-applet/NMWirelessApplet.c	24 Jan 2005 18:46:25 -0000	1.59
+++ panel-applet/NMWirelessApplet.c	30 Jan 2005 06:28:30 -0000
@@ -42,7 +42,7 @@
 
 #include <gnome.h>
 
-#include <libgnomeui/libgnomeui.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 #include <gconf/gconf-client.h>
 
@@ -1039,7 +1039,7 @@ static GtkWidget * nmwa_get_instance (NM
 
 static gboolean nmwa_fill (NMWirelessApplet *applet)
 {
-	gnome_window_icon_set_default_from_file (ICONDIR"/NMWirelessApplet/wireless-applet.png");
+	gtk_window_set_default_icon_from_file (ICONDIR"/NMWirelessApplet/wireless-applet.png", NULL);
 
 	glade_gnome_init ();
 	gtk_widget_show (nmwa_get_instance (applet));
Index: panel-applet/NMWirelessAppletOtherNetworkDialog.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/panel-applet/NMWirelessAppletOtherNetworkDialog.c,v
retrieving revision 1.5
diff -u -p -r1.5 NMWirelessAppletOtherNetworkDialog.c
--- panel-applet/NMWirelessAppletOtherNetworkDialog.c	21 Jan 2005 17:54:29 -0000	1.5
+++ panel-applet/NMWirelessAppletOtherNetworkDialog.c	30 Jan 2005 06:28:30 -0000
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 
 #include <gnome.h>
-#include <libgnomeui/libgnomeui.h>
+#include <glib/gi18n.h>
 #include <glade/glade.h>
 
 #include "NetworkManager.h"
Index: panel-applet/NMWirelessAppletOtherNetworkDialog.h
===================================================================
RCS file: /cvs/gnome/NetworkManager/panel-applet/NMWirelessAppletOtherNetworkDialog.h,v
retrieving revision 1.2
diff -u -p -r1.2 NMWirelessAppletOtherNetworkDialog.h
--- panel-applet/NMWirelessAppletOtherNetworkDialog.h	17 Dec 2004 17:16:22 -0000	1.2
+++ panel-applet/NMWirelessAppletOtherNetworkDialog.h	30 Jan 2005 06:28:30 -0000
@@ -19,7 +19,6 @@
  * (C) Copyright 2004 Red Hat, Inc.
  */
 
-#include <libgnomeui/libgnomeui.h>
 #include "NMWirelessApplet.h"
 
 
Index: panel-applet/menu-info.c
===================================================================
RCS file: /cvs/gnome/NetworkManager/panel-applet/menu-info.c,v
retrieving revision 1.11
diff -u -p -r1.11 menu-info.c
--- panel-applet/menu-info.c	25 Jan 2005 01:45:54 -0000	1.11
+++ panel-applet/menu-info.c	30 Jan 2005 06:28:30 -0000
@@ -30,7 +30,7 @@
 #include <config.h>
 #endif
 
-#include <libintl.h>
+#include <glib/gi18n.h>
 #include <string.h>
 #include "menu-info.h"