system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-15 04:24:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

2005-02-02 Dan Williams <dcbw@redhat.com>

Browse source 
Patch from Nathan Fredrickson <nathan@silverorange.com>
	* Fix up compile for deprecation of libgnomeui
		- Switch to <glib/gi18n.h> from <libintl.h>
		- Remove <libgnomeui/libgnomeui.h> includes
		- Use gtk_window_set_default_icon_from_file() rather than
			gnome_window_set_default_icon_from_file()

	* named/nm-named-manager.c
		- (generate_named_conf): Fix return-nothing in non-void
			function


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@409 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2005-02-02 22:34:16 +00:00
parent 9a46c8dbed
commit 89e34169ee
6 changed files with 20 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ChangeLog
View file

@ -1,3 +1,16 @@
2005-02-02 Dan Williams <dcbw@redhat.com>
Patch from Nathan Fredrickson <nathan@silverorange.com>
* Fix up compile for deprecation of libgnomeui
- Switch to <glib/gi18n.h> from <libintl.h>
- Remove <libgnomeui/libgnomeui.h> includes
- Use gtk_window_set_default_icon_from_file() rather than
gnome_window_set_default_icon_from_file()
* named/nm-named-manager.c
- (generate_named_conf): Fix return-nothing in non-void
function
2005-02-02 Dan Williams <dcbw@redhat.com>
* Clean up unused variables and the like

5
named/nm-named-manager.c
View file

@ -305,6 +305,8 @@ compute_domain_zones (NMNamedManager *mgr)
gboolean
generate_named_conf (NMNamedManager *mgr, GError **error)
{
gboolean ret = FALSE;
#ifdef NM_NO_NAMED
if (mgr->priv->use_named == FALSE)
return rewrite_resolv_conf (mgr, error);
@ -315,7 +317,6 @@ generate_named_conf (NMNamedManager *mgr, GError **error)
char **config_contents;
char **line;
const char *config_name;
gboolean ret;
config_name = NM_PKGDATADIR "/named.conf";
@ -435,8 +436,8 @@ generate_named_conf (NMNamedManager *mgr, GError **error)
write_lose:
close (out_fd);
g_strfreev (config_contents);
return ret;
#endif
return ret;
}
static void

4
panel-applet/NMWirelessApplet.c
View file

@ -42,7 +42,7 @@
#include <gnome.h>
#include <libgnomeui/libgnomeui.h>
#include <glib/gi18n.h>
#include <glade/glade.h>
#include <gconf/gconf-client.h>
@ -1047,7 +1047,7 @@ static GtkWidget * nmwa_get_instance (NMWirelessApplet *applet)
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));

2
panel-applet/NMWirelessAppletOtherNetworkDialog.c
View file

@ -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"

1
panel-applet/NMWirelessAppletOtherNetworkDialog.h
View file

@ -19,7 +19,6 @@
* (C) Copyright 2004 Red Hat, Inc.
*/
#include <libgnomeui/libgnomeui.h>
#include "NMWirelessApplet.h"

2
panel-applet/menu-info.c
View file

@ -30,7 +30,7 @@
#include <config.h>
#endif
#include <libintl.h>
#include <glib/gi18n.h>
#include <string.h>
#include "menu-info.h"