cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Zap bogus enum.

Browse Source
This commit is contained in:
ajacoutot 2011-06-15 17:01:07 +00:00
parent 3fde18c238
commit 9f01263238
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome3/x11/gnome/nettool/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.4 2011/05/28 08:15:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.5 2011/06/15 17:01:07 ajacoutot Exp $
COMMENT= GNOME interface for various networking tools
GNOME_PROJECT= gnome-nettool
GNOME_VERSION= 3.0.0
REVISION= 2
REVISION= 3
CATEGORIES= net

16
x11/gnome3/x11/gnome/nettool/patches/patch-src_info_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_info_c,v 1.2 2011/05/18 13:29:11 jasper Exp $
$OpenBSD: patch-src_info_c,v 1.3 2011/06/15 17:01:07 ajacoutot Exp $
- Add OpenBSD/FreeBSD specific code
- g_object_unref() prevents interface name and pixmap from being displayed,
and creates a storm of critial gtk warnings, upstream bz: #647896.
--- src/info.c.orig Thu Dec 2 10:26:14 2010
+++ src/info.c Wed May 18 15:21:05 2011
+++ src/info.c Wed Jun 15 18:58:08 2011
@@ -20,6 +20,10 @@
#include <gtk/gtk.h>
#include <glib/gi18n.h>
@ -27,15 +27,7 @@ $OpenBSD: patch-src_info_c,v 1.2 2011/05/18 13:29:11 jasper Exp $
#include <glibtop.h>
#include <glibtop/netlist.h>
@@ -61,6 +68,7 @@ static InfoInterfaceDescription info_iface_desc [] = {
{ N_("Ethernet Interface"), INFO_INTERFACE_ETH, "16_ethernet.xpm", "eth", NULL },
{ N_("Wireless Interface"), INFO_INTERFACE_WLAN, "wavelan-16.png", "wlan", NULL },
{ N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "ppp", NULL },
+ { N_("Modem Interface"), INFO_INTERFACE_PPP, "16_ppp.xpm", "tun", NULL },
{ N_("Parallel Line Interface"), INFO_INTERFACE_PLIP, "16_plip.xpm", "plip", NULL },
{ N_("Infrared Interface"), INFO_INTERFACE_IRLAN, "irda-16.png", "irlan", NULL },
{ N_("Loopback Interface"), INFO_INTERFACE_LO, "16_loopback.xpm", "lo", NULL },
@@ -131,9 +139,44 @@ info_get_interface_from_dev_name (const gchar *dev_nam
@@ -131,9 +138,44 @@ info_get_interface_from_dev_name (const gchar *dev_nam
{
gint i;
gchar *path;
@ -82,7 +74,7 @@ $OpenBSD: patch-src_info_c,v 1.2 2011/05/18 13:29:11 jasper Exp $
(*iface) = g_strdup_printf ("%s (%s)", _(info_iface_desc[i].name), dev_name);
if (info_iface_desc[i].pixbuf == NULL) {
path = g_build_filename (PIXMAPS_DIR, info_iface_desc[i].icon, NULL);
@@ -200,13 +243,13 @@ info_load_iface (Netinfo *info)
@@ -200,13 +242,13 @@ info_load_iface (Netinfo *info)
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (info->combo), renderer, TRUE);
gtk_cell_layout_set_attributes (GTK_CELL_LAYOUT (info->combo), renderer,
"pixbuf", 0, NULL);