Hello community, here is the log from the commit of package gnome-main-menu checked in at Mon May 12 09:58:50 CEST 2008. -------- --- GNOME/gnome-main-menu/gnome-main-menu.changes 2008-05-07 21:54:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/gnome-main-menu/gnome-main-menu.changes 2008-05-12 08:08:18.983752000 +0200 @@ -1,0 +2,5 @@ +Mon May 12 08:13:30 CEST 2008 - tambet@suse.de + +- Fix a build issue caused by NetworkManager API breakage. + +------------------------------------------------------------------- New: ---- gnome-main-menu-nm-ip-addresses.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gnome-main-menu.spec ++++++ --- /var/tmp/diff_new_pack.t14075/_old 2008-05-12 09:58:38.000000000 +0200 +++ /var/tmp/diff_new_pack.t14075/_new 2008-05-12 09:58:38.000000000 +0200 @@ -20,7 +20,7 @@ Group: System/GUI/GNOME AutoReqProv: on Version: 0.9.10 -Release: 14 +Release: 16 Summary: The GNOME Desktop Menu Source: %{name}-%{version}.tar.gz Source1: system-items-opensuse.xbel @@ -28,6 +28,7 @@ Patch1: gnome-main-menu-bnc380339-multiple-applet-crash.diff # PATCH-FIX-UPSTREAM gnome-main-menu-bnc262334-network-status-without-nm.diff bnc262334 captain.magnus@gmail.com Patch2: gnome-main-menu-bnc262334-network-status-without-nm.diff +Patch3: gnome-main-menu-nm-ip-addresses.patch Url: http://www.gnome.org BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: gnome-panel dbus-1-glib hal tango-icon-theme wireless-tools libssui eel @@ -85,6 +86,7 @@ cp -f %{S:1} main-menu/etc/system-items.xbel %patch1 -p1 %patch2 -p1 +%patch3 -p1 %build autoreconf -f -i @@ -155,6 +157,8 @@ %{_prefix}/%{_lib}/nautilus/extensions-1.0/*.la %changelog +* Mon May 12 2008 tambet@suse.de +- Fix a build issue caused by NetworkManager API breakage. * Wed May 07 2008 federico@novell.com - Added gnome-main-menu-bnc262334-network-status-without-nm.diff to fix https://bugzilla.novell.com/show_bug.cgi?id=262334 - Main-menu ++++++ gnome-main-menu-nm-ip-addresses.patch ++++++ Index: gnome-main-menu-0.9.10/ChangeLog =================================================================== --- gnome-main-menu-0.9.10.orig/ChangeLog +++ gnome-main-menu-0.9.10/ChangeLog @@ -1,3 +1,8 @@ +2008-05-12 Tambet Ingo <tambet@gmail.com> + + * main-menu/src/network-status-agent.c (nm_get_device_info): + Fix another NetworkManager API breakage. + 2008-04-11 Tambet Ingo <tambet@gmail.com> Adapt the API changes of libnm-glib. Index: gnome-main-menu-0.9.10/main-menu/src/network-status-agent.c =================================================================== --- gnome-main-menu-0.9.10.orig/main-menu/src/network-status-agent.c +++ gnome-main-menu-0.9.10/main-menu/src/network-status-agent.c @@ -25,6 +25,7 @@ #include <NetworkManager.h> #include <libnm-glib/nm-device-802-11-wireless.h> #include <libnm-glib/nm-device-802-3-ethernet.h> +#include <nm-setting-ip4-config.h> #include <nm-utils.h> #include <arpa/inet.h> #include <dbus/dbus.h> @@ -199,6 +200,8 @@ nm_get_device_info (NetworkStatusAgent * { NetworkStatusInfo *info = g_object_new (NETWORK_STATUS_INFO_TYPE, NULL); const GArray *array; + NMSettingIP4Address *def_addr; + guint32 hostmask, network, bcast; info->iface = g_strdup (nm_device_get_iface (device)); info->driver = g_strdup (nm_device_get_driver (device)); @@ -208,10 +211,18 @@ nm_get_device_info (NetworkStatusAgent * NMIP4Config * cfg = nm_device_get_ip4_config (device); if(! cfg) return info; - info->ip4_addr = ip4_address_as_string (nm_ip4_config_get_address (cfg)); - info->subnet_mask = ip4_address_as_string (nm_ip4_config_get_netmask (cfg)); - info->broadcast = ip4_address_as_string (nm_ip4_config_get_broadcast (cfg)); - info->route = ip4_address_as_string (nm_ip4_config_get_gateway (cfg)); + + def_addr = nm_ip4_config_get_addresses (cfg); + if (def_addr) { + info->ip4_addr = ip4_address_as_string (def_addr->address); + info->subnet_mask = ip4_address_as_string (def_addr->netmask); + info->route = ip4_address_as_string (def_addr->gateway); + + network = ntohl (def_addr->address) & ntohl (def_addr->netmask); + hostmask = ~ntohl (def_addr->netmask); + bcast = htonl (network | hostmask); + info->broadcast = ip4_address_as_string (bcast); + } info->primary_dns = NULL; info->secondary_dns = NULL; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org