From: Dan Winship <danw@gnome.org>
Date: Tue, 29 Nov 2011 20:45:37 +0000 (+0100)
Subject: gnetworkmonitornetlink.c: Make the error messages less geeky
X-Git-Tag: 2.31.4~131
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1f33446e1fae721cc6c8f260afe2ebfa42dd51c8;p=platform%2Fupstream%2Fglib.git

gnetworkmonitornetlink.c: Make the error messages less geeky

This makes several different errors have identical messages, but
they're pretty much "can't happen" situations anyway.

https://bugzilla.gnome.org/show_bug.cgi?id=664406
---

diff --git a/gio/gnetworkmonitornetlink.c b/gio/gnetworkmonitornetlink.c
index da60b8a..ede8111 100644
--- a/gio/gnetworkmonitornetlink.c
+++ b/gio/gnetworkmonitornetlink.c
@@ -91,7 +91,7 @@ g_network_monitor_netlink_initable_init (GInitable     *initable,
     {
       int errsv = errno;
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-		   _("Could not create netlink socket: %s"),
+		   _("Could not create network monitor: %s"),
 		   g_strerror (errno));
       return FALSE;
     }
@@ -103,7 +103,7 @@ g_network_monitor_netlink_initable_init (GInitable     *initable,
     {
       int errsv = errno;
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-		   _("Could not bind netlink socket: %s"),
+		   _("Could not create network monitor: %s"),
 		   g_strerror (errno));
       close (sockfd);
       return FALSE;
@@ -114,7 +114,7 @@ g_network_monitor_netlink_initable_init (GInitable     *initable,
     {
       int errsv = errno;
       g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errsv),
-		   _("Could not set options on netlink socket: %s"),
+		   _("Could not create network monitor: %s"),
 		   g_strerror (errno));
       close (sockfd);
       return FALSE;
@@ -123,7 +123,7 @@ g_network_monitor_netlink_initable_init (GInitable     *initable,
   nl->priv->sock = g_socket_new_from_fd (sockfd, error);
   if (error)
     {
-      g_prefix_error (error, "%s", _("Could not wrap netlink socket: "));
+      g_prefix_error (error, "%s", _("Could not create network monitor: "));
       close (sockfd);
       return FALSE;
     }
@@ -171,7 +171,7 @@ request_dump (GNetworkMonitorNetlink  *nl,
   if (g_socket_send (nl->priv->sock, buf, sizeof (buf),
 		     NULL, error) < 0)
     {
-      g_prefix_error (error, "%s", _("Could not send netlink request: "));
+      g_prefix_error (error, "%s", _("Could not get network status: "));
       return FALSE;
     }