colin/NetworkManager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* panel-applet/essid.glade
	  panel-applet/NMWirelessAppletOtherNetworksDialog.c
		- Correct spelling of "adaptor"->"adapter"

2005-02-18  William Jon McCann  <mccann@jhu.edu>

	* panel-applet/NMWirelessApplet.c: Use GTK_CHECK_VERSION() macro.
	(nmwa_about_cb): Use standard copyright string.  Update comment
	text to reflect that it is a notification area applet.  Remove
	leading newline in authors list.
	(nmwa_menu_show_cb, nmwa_setup_widgets): Populate menu on show
	instead of on parent menu item activation.  Fixes #167550.

2005-02-18  William Jon McCann  <mccann@jhu.edu>

	* panel-applet/essid.glade: Capitalize items as per HIG.
	  Fixes #167632


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@458 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams
2005-02-18 18:15:54 +00:00
parent 261f7c5a0a
commit 6411cc5ade
36 changed files with 145 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
ChangeLog
View File

@@ -1,3 +1,23 @@
2005-02-18 Dan Williams <dcbw@redhat.com>
* panel-applet/essid.glade
panel-applet/NMWirelessAppletOtherNetworksDialog.c
- Correct spelling of "adaptor"->"adapter"
2005-02-18 William Jon McCann <mccann@jhu.edu>
* panel-applet/NMWirelessApplet.c: Use GTK_CHECK_VERSION() macro.
(nmwa_about_cb): Use standard copyright string. Update comment
text to reflect that it is a notification area applet. Remove
leading newline in authors list.
(nmwa_menu_show_cb, nmwa_setup_widgets): Populate menu on show
instead of on parent menu item activation. Fixes #167550.
2005-02-18 William Jon McCann <mccann@jhu.edu>
* panel-applet/essid.glade: Capitalize items as per HIG.
Fixes #167632
2005-02-16 William Jon McCann <mccann@jhu.edu> 2005-02-16 William Jon McCann <mccann@jhu.edu>
* panel-applet/gtkcellrendererprogress.[ch]: Only compile these * panel-applet/gtkcellrendererprogress.[ch]: Only compile these

25
panel-applet/Makefile.am
View File

@@ -7,20 +7,24 @@ INCLUDES = -I${top_srcdir}
noinst_LTLIBRARIES = libnm_notification_applet.la noinst_LTLIBRARIES = libnm_notification_applet.la
libnm_notification_applet_la_CPPFLAGS = \ gladedir = $(datadir)/NetworkManagerNotification
$(DBUS_CFLAGS) \ glade_DATA = essid.glade
$(GTHREAD_CFLAGS) \
$(HAL_CFLAGS) \ libnm_notification_applet_la_CPPFLAGS = \
$(DBUS_GLIB_CFLAGS) \ $(DBUS_CFLAGS) \
$(GTHREAD_CFLAGS) \
$(HAL_CFLAGS) \
$(DBUS_GLIB_CFLAGS) \
$(GLADE_CFLAGS) \ $(GLADE_CFLAGS) \
$(GTK_CFLAGS) \ $(GTK_CFLAGS) \
$(GCONF_CFLAGS) \ $(GCONF_CFLAGS) \
$(LIBGNOMEUI_CFLAGS) \ $(LIBGNOMEUI_CFLAGS) \
$(PANEL_APPLET_CFLAGS) \ $(PANEL_APPLET_CFLAGS) \
-DICONDIR=\""$(datadir)/pixmaps"\" \ -DICONDIR=\""$(datadir)/pixmaps"\" \
-DGLADEDIR=\""$(gladedir)"\" \
-DDBUS_API_SUBJECT_TO_CHANGE \ -DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \ -DG_DISABLE_DEPRECATED \
-DGDK_DISABLE_DEPRECATED \ -DGDK_DISABLE_DEPRECATED \
-DGNOME_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DVERSION=\"$(VERSION)\" \ -DVERSION=\"$(VERSION)\" \
@@ -48,10 +52,10 @@ libnm_notification_applet_la_SOURCES += \
libnm_notification_applet_la_LIBADD = \ libnm_notification_applet_la_LIBADD = \
$(DBUS_LIBS) \ $(DBUS_LIBS) \
$(HAL_LIBS) \ $(HAL_LIBS) \
$(GTHREAD_LIBS) \ $(GTHREAD_LIBS) \
$(GLADE_LIBS) \ $(GLADE_LIBS) \
$(DBUS_GLIB_LIBS) \ $(DBUS_GLIB_LIBS) \
$(PANEL_APPLET_LIBS) \ $(PANEL_APPLET_LIBS) \
$(GTK_LIBS) \ $(GTK_LIBS) \
$(GCONF_LIBS) \ $(GCONF_LIBS) \
$(LIBGNOMEUI_LIBS) \ $(LIBGNOMEUI_LIBS) \
@@ -63,9 +67,6 @@ NetworkManagerNotification_CFLAGS = $(libnm_notification_applet_la_CPPFLAGS)
NetworkManagerNotification_SOURCES = main.c NetworkManagerNotification_SOURCES = main.c
NetworkManagerNotification_LDADD = ./libnm_notification_applet.la NetworkManagerNotification_LDADD = ./libnm_notification_applet.la
gladedir = $(datadir)/NetworkManagerNotification
glade_DATA = essid.glade
CLEANFILES = $(server_DATA) *.bak *.gladep CLEANFILES = $(server_DATA) *.bak *.gladep
EXTRA_DIST = \ EXTRA_DIST = \

97
panel-applet/NMWirelessApplet.c
View File

@@ -1,3 +1,4 @@
/* -*- Mode: C; tab-width: 5; indent-tabs-mode: t; c-basic-offset: 5 -*- */
/* NetworkManager Wireless Applet -- Display wireless access points and allow user control /* NetworkManager Wireless Applet -- Display wireless access points and allow user control
* *
* Dan Williams <dcbw@redhat.com> * Dan Williams <dcbw@redhat.com>
@@ -39,10 +40,15 @@
#include <errno.h> #include <errno.h>
#include <math.h> #include <math.h>
#include <dirent.h> #include <dirent.h>
#include <time.h>
#include <gnome.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h>
#if !GTK_CHECK_VERSION(2,6,0)
#include <gnome.h>
#endif
#include <glade/glade.h> #include <glade/glade.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
@@ -76,36 +82,36 @@ G_DEFINE_TYPE(NMWirelessApplet, nmwa, EGG_TYPE_TRAY_ICON)
static void static void
nmwa_init (NMWirelessApplet *applet) nmwa_init (NMWirelessApplet *applet)
{ {
applet->animation_id = 0; applet->animation_id = 0;
applet->animation_step = 0; applet->animation_step = 0;
setup_stock (); setup_stock ();
nmwa_icons_init (applet); nmwa_icons_init (applet);
nmwa_fill (applet); nmwa_fill (applet);
} }
static void nmwa_class_init (NMWirelessAppletClass *klass) static void nmwa_class_init (NMWirelessAppletClass *klass)
{ {
GObjectClass *gobject_class; GObjectClass *gobject_class;
gobject_class = G_OBJECT_CLASS (klass); gobject_class = G_OBJECT_CLASS (klass);
gobject_class->constructor = nmwa_constructor; gobject_class->constructor = nmwa_constructor;
} }
static GObject *nmwa_constructor (GType type, static GObject *nmwa_constructor (GType type,
guint n_props, guint n_props,
GObjectConstructParam *construct_props) GObjectConstructParam *construct_props)
{ {
GObject *obj; GObject *obj;
NMWirelessApplet *applet; NMWirelessApplet *applet;
NMWirelessAppletClass *klass; NMWirelessAppletClass *klass;
klass = NM_WIRELESS_APPLET_CLASS (g_type_class_peek (type)); klass = NM_WIRELESS_APPLET_CLASS (g_type_class_peek (type));
obj = G_OBJECT_CLASS (nmwa_parent_class)->constructor (type, n_props, construct_props); obj = G_OBJECT_CLASS (nmwa_parent_class)->constructor (type, n_props, construct_props);
applet = NM_WIRELESS_APPLET (obj); applet = NM_WIRELESS_APPLET (obj);
return obj; return obj;
} }
@@ -117,7 +123,7 @@ void nmwa_about_cb (NMWirelessApplet *applet)
static const gchar *authors[] = static const gchar *authors[] =
{ {
"\nThe Red Hat Desktop Team, including:\n", "The Red Hat Desktop Team, including:\n",
"Dan Williams <dcbw@redhat.com>", "Dan Williams <dcbw@redhat.com>",
"Jonathan Blandford <jrb@redhat.com>", "Jonathan Blandford <jrb@redhat.com>",
"John Palmieri <johnp@redhat.com>", "John Palmieri <johnp@redhat.com>",
@@ -130,21 +136,20 @@ void nmwa_about_cb (NMWirelessApplet *applet)
NULL NULL
}; };
#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6) #if !GTK_CHECK_VERSION(2,6,0)
/* GTK 2.4 and earlier, have to use libgnome for about dialog */ /* GTK 2.4 and earlier, have to use libgnome for about dialog */
file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-networktool.png", FALSE, NULL); file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-networktool.png", FALSE, NULL);
pixbuf = gdk_pixbuf_new_from_file (file, NULL); pixbuf = gdk_pixbuf_new_from_file (file, NULL);
g_free (file); g_free (file);
about_dialog = gnome_about_new ( about_dialog = gnome_about_new (_("NetworkManager Applet"),
_("NetworkManager Applet"), VERSION,
VERSION, _("Copyright \xc2\xa9 2004-2005 Red Hat, Inc."),
_("(C) 2004-2005 Red Hat, Inc."), _("Notification area applet for managing your network devices and connections."),
_("A panel application for managing your network devices & connections."), authors,
authors, documenters,
documenters, NULL,
NULL, pixbuf);
pixbuf);
g_object_unref (pixbuf); g_object_unref (pixbuf);
gtk_window_set_screen (GTK_WINDOW (about_dialog), gtk_widget_get_screen (GTK_WIDGET (applet))); gtk_window_set_screen (GTK_WINDOW (about_dialog), gtk_widget_get_screen (GTK_WIDGET (applet)));
@@ -155,15 +160,15 @@ void nmwa_about_cb (NMWirelessApplet *applet)
/* GTK 2.6 and later code */ /* GTK 2.6 and later code */
gtk_show_about_dialog (NULL, gtk_show_about_dialog (NULL,
"name", _("NetworkManager Applet"), "name", _("NetworkManager Applet"),
"version", VERSION, "version", VERSION,
"copyright", _("(C) 2004-2005 by Red Hat, Inc."), "copyright", _("Copyright \xc2\xa9 2004-2005 Red Hat, Inc."),
"comments", _("A panel application for managing your network devices & connections."), "comments", _("Notification area applet for managing your network devices and connections."),
"authors", authors, "authors", authors,
"documenters", documenters, "documenters", documenters,
"translator-credits", NULL, "translator-credits", NULL,
"logo-icon-name", GTK_STOCK_NETWORK, "logo-icon-name", GTK_STOCK_NETWORK,
NULL); NULL);
#endif #endif
} }
@@ -341,8 +346,8 @@ nmwa_update_state (NMWirelessApplet *applet)
WirelessNetwork *active_network = NULL; WirelessNetwork *active_network = NULL;
g_mutex_lock (applet->data_mutex); g_mutex_lock (applet->data_mutex);
if ( applet->active_device if (applet->active_device
&& (applet->active_device->type == DEVICE_TYPE_WIRELESS_ETHERNET)) && (applet->active_device->type == DEVICE_TYPE_WIRELESS_ETHERNET))
{ {
GSList *list; GSList *list;
@@ -655,12 +660,12 @@ static void nmwa_menu_item_activate (GtkMenuItem *item, gpointer user_data)
/* /*
* nmwa_toplevel_menu_activate * nmwa_menu_show_cb
* *
* Pop up the wireless networks menu in response to a click on the applet * Pop up the wireless networks menu in response to a click on the applet
* *
*/ */
static void nmwa_toplevel_menu_activate (GtkWidget *menu, NMWirelessApplet *applet) static void nmwa_menu_show_cb (GtkWidget *menu, NMWirelessApplet *applet)
{ {
if (!applet->tooltips) if (!applet->tooltips)
applet->tooltips = gtk_tooltips_new (); applet->tooltips = gtk_tooltips_new ();
@@ -1153,13 +1158,13 @@ static void nmwa_setup_widgets (NMWirelessApplet *applet)
gtk_container_set_border_width (GTK_CONTAINER (applet->toplevel_menu), 0); gtk_container_set_border_width (GTK_CONTAINER (applet->toplevel_menu), 0);
gtk_container_add (GTK_CONTAINER(applet->toplevel_menu), applet->pixmap); gtk_container_add (GTK_CONTAINER(applet->toplevel_menu), applet->pixmap);
gtk_menu_shell_append (GTK_MENU_SHELL(menu_bar), applet->toplevel_menu); gtk_menu_shell_append (GTK_MENU_SHELL(menu_bar), applet->toplevel_menu);
g_signal_connect (applet->toplevel_menu, "activate", G_CALLBACK (nmwa_toplevel_menu_activate), applet);
applet->context_menu = nmwa_context_menu_create (applet); applet->context_menu = nmwa_context_menu_create (applet);
g_signal_connect (applet->toplevel_menu, "button_press_event", G_CALLBACK (nmwa_toplevel_menu_button_press), applet); g_signal_connect (applet->toplevel_menu, "button_press_event", G_CALLBACK (nmwa_toplevel_menu_button_press), applet);
applet->menu = gtk_menu_new(); applet->menu = gtk_menu_new ();
gtk_menu_item_set_submenu (GTK_MENU_ITEM(applet->toplevel_menu), applet->menu); gtk_menu_item_set_submenu (GTK_MENU_ITEM (applet->toplevel_menu), applet->menu);
g_signal_connect (applet->menu, "show", G_CALLBACK (nmwa_menu_show_cb), applet);
applet->encryption_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); applet->encryption_size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);

2
panel-applet/NMWirelessApplet.h
View File

@@ -21,7 +21,7 @@
#ifndef NM_WIRELESS_APPLET_H #ifndef NM_WIRELESS_APPLET_H
#define NM_WIRELESS_APPLET_H #define NM_WIRELESS_APPLET_H
#include <gnome.h> #include <gtk/gtk.h>
#include <gconf/gconf-client.h> #include <gconf/gconf-client.h>
#include <glade/glade.h> #include <glade/glade.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>

22
panel-applet/NMWirelessAppletOtherNetworkDialog.c
View File

@@ -33,8 +33,8 @@
#include <string.h> #include <string.h>
#include <stdlib.h> #include <stdlib.h>
#include <gnome.h>
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <glade/glade.h> #include <glade/glade.h>
#include "NetworkManager.h" #include "NetworkManager.h"
@@ -98,7 +98,7 @@ static void update_button_cb (GtkWidget *widget, GladeXML *xml)
gtk_widget_set_sensitive (GTK_WIDGET (button), enable); gtk_widget_set_sensitive (GTK_WIDGET (button), enable);
} }
static GtkTreeModel *create_wireless_adaptor_model (NMWirelessApplet *applet) static GtkTreeModel *create_wireless_adapter_model (NMWirelessApplet *applet)
{ {
GtkListStore *retval; GtkListStore *retval;
GSList *element; GSList *element;
@@ -214,6 +214,7 @@ static GtkDialog *nmwa_other_network_dialog_init (GladeXML *xml, NMWirelessApple
/* Set up the dialog */ /* Set up the dialog */
dialog = GTK_DIALOG (glade_xml_get_widget (xml, "custom_essid_dialog")); dialog = GTK_DIALOG (glade_xml_get_widget (xml, "custom_essid_dialog"));
gtk_window_set_default_size (GTK_WINDOW (dialog), 488, -1);
essid_entry = glade_xml_get_widget (xml, "essid_entry"); essid_entry = glade_xml_get_widget (xml, "essid_entry");
button = glade_xml_get_widget (xml, "ok_button"); button = glade_xml_get_widget (xml, "ok_button");
@@ -262,16 +263,16 @@ static GtkDialog *nmwa_other_network_dialog_init (GladeXML *xml, NMWirelessApple
} }
else if (n_wireless_interfaces == 1) else if (n_wireless_interfaces == 1)
{ {
gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adaptor_label")); gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adapter_label"));
gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adaptor_combo")); gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adapter_combo"));
} }
else else
{ {
GtkWidget *combo; GtkWidget *combo;
GtkTreeModel *model; GtkTreeModel *model;
combo = glade_xml_get_widget (xml, "wireless_adaptor_combo"); combo = glade_xml_get_widget (xml, "wireless_adapter_combo");
model = create_wireless_adaptor_model (applet); model = create_wireless_adapter_model (applet);
gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model); gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model);
/* Select the first one randomly */ /* Select the first one randomly */
@@ -301,15 +302,14 @@ static GtkDialog *nmwa_other_network_dialog_init (GladeXML *xml, NMWirelessApple
void nmwa_other_network_dialog_run (NMWirelessApplet *applet, gboolean create_network) void nmwa_other_network_dialog_run (NMWirelessApplet *applet, gboolean create_network)
{ {
gchar *glade_file; gchar *glade_file;
GtkDialog *dialog; GtkDialog *dialog;
GladeXML *xml; GladeXML *xml;
gint response; gint response;
NetworkDevice *def_dev = NULL; NetworkDevice *def_dev = NULL;
g_return_if_fail (applet != NULL); g_return_if_fail (applet != NULL);
glade_file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_DATADIR, glade_file = g_build_filename (GLADEDIR, "essid.glade", NULL);
"NetworkManagerNotification/essid.glade", FALSE, NULL);
if (!glade_file || !g_file_test (glade_file, G_FILE_TEST_IS_REGULAR)) if (!glade_file || !g_file_test (glade_file, G_FILE_TEST_IS_REGULAR))
{ {

18
panel-applet/essid.glade
View File

@@ -126,9 +126,9 @@
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<child> <child>
<widget class="GtkLabel" id="wireless_adaptor_label"> <widget class="GtkLabel" id="wireless_adapter_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Wireless _Adaptor:</property> <property name="label" translatable="yes">Wireless _adapter:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -138,7 +138,7 @@
<property name="yalign">0.5</property> <property name="yalign">0.5</property>
<property name="xpad">0</property> <property name="xpad">0</property>
<property name="ypad">0</property> <property name="ypad">0</property>
<property name="mnemonic_widget">wireless_adaptor_combo</property> <property name="mnemonic_widget">wireless_adapter_combo</property>
</widget> </widget>
<packing> <packing>
<property name="left_attach">0</property> <property name="left_attach">0</property>
@@ -151,7 +151,7 @@
</child> </child>
<child> <child>
<widget class="GtkComboBox" id="wireless_adaptor_combo"> <widget class="GtkComboBox" id="wireless_adapter_combo">
<property name="visible">True</property> <property name="visible">True</property>
<property name="items" translatable="yes"></property> <property name="items" translatable="yes"></property>
</widget> </widget>
@@ -168,7 +168,7 @@
<child> <child>
<widget class="GtkLabel" id="label2"> <widget class="GtkLabel" id="label2">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Wireless _Network:</property> <property name="label" translatable="yes">Wireless _network:</property>
<property name="use_underline">True</property> <property name="use_underline">True</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -242,7 +242,7 @@
<child> <child>
<widget class="GtkLabel" id="key_type_combo_label"> <widget class="GtkLabel" id="key_type_combo_label">
<property name="visible">True</property> <property name="visible">True</property>
<property name="label" translatable="yes">Key Type:</property> <property name="label" translatable="yes">Key type:</property>
<property name="use_underline">False</property> <property name="use_underline">False</property>
<property name="use_markup">False</property> <property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property> <property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -311,9 +311,9 @@
<child> <child>
<widget class="GtkComboBox" id="key_type_combo"> <widget class="GtkComboBox" id="key_type_combo">
<property name="visible">True</property> <property name="visible">True</property>
<property name="items" translatable="yes">128-bit Passphrase (WEP) <property name="items" translatable="yes">128-bit passphrase (WEP)
Ascii Key (WEP) Ascii key (WEP)
Hex Key (WEP)</property> Hex key (WEP)</property>
</widget> </widget>
<packing> <packing>
<property name="left_attach">1</property> <property name="left_attach">1</property>

3
panel-applet/menu-info.c
View File

@@ -36,9 +36,9 @@
#if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6) #if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6)
#include "gtkcellview.h" #include "gtkcellview.h"
#include "gtkcellrendererprogress.h"
#endif #endif
#include "gtkcellrendererprogress.h"
#include "NMWirelessAppletDbus.h" #include "NMWirelessAppletDbus.h"
static gboolean nm_menu_wired_expose_event (GtkWidget *widget, GdkEventExpose *event); static gboolean nm_menu_wired_expose_event (GtkWidget *widget, GdkEventExpose *event);
@@ -208,6 +208,7 @@ nm_menu_wireless_init (NMMenuWireless *menu_info)
menu_info->progress_bar = g_object_new (GTK_TYPE_CELL_RENDERER_PROGRESS, menu_info->progress_bar = g_object_new (GTK_TYPE_CELL_RENDERER_PROGRESS,
"text", "", "text", "",
NULL); NULL);
gtk_cell_renderer_set_fixed_size (GTK_CELL_RENDERER (menu_info->progress_bar), 150, -1);
gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (menu_info->cell_view), gtk_cell_layout_pack_start (GTK_CELL_LAYOUT (menu_info->cell_view),
GTK_CELL_RENDERER (menu_info->progress_bar), GTK_CELL_RENDERER (menu_info->progress_bar),
TRUE); TRUE);

4
po/ChangeLog
View File

@@ -1,3 +1,7 @@
2005-02-18 Dan Williams <dcbw@redhat.com>
* Correct spelling of "adaptor"->"adapter"
2005-02-18 Kjartan Maraas <kmaraas@gnome.org> 2005-02-18 Kjartan Maraas <kmaraas@gnome.org>
* nb.po: Update * nb.po: Update

2
po/bs.po
View File

@@ -112,7 +112,7 @@ msgstr "Wireless Mreže"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
#, fuzzy #, fuzzy
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Wireless Mreže" msgstr "Wireless Mreže"
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

2
po/cs.po
View File

@@ -220,7 +220,7 @@ msgid "Connect with encryption enabled"
msgstr "Připojit se s povoleným šifrováním" msgstr "Připojit se s povoleným šifrováním"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Bezdrátový _adaptér:" msgstr "Bezdrátový _adaptér:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/da.po
View File

@@ -111,7 +111,7 @@ msgid "Wireless _Network:"
msgstr "Ændre trådløse netværk" msgstr "Ændre trådløse netværk"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "" msgstr ""
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

2
po/de.po
View File

@@ -232,7 +232,7 @@ msgid "Connect with encryption enabled"
msgstr "Verschlüsselte Verbindung ist aktiv" msgstr "Verschlüsselte Verbindung ist aktiv"
#: ../panel-applet/essid.glade.h:9 #: ../panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Funknetzwerk_adapter:" msgstr "Funknetzwerk_adapter:"
#: ../panel-applet/essid.glade.h:10 #: ../panel-applet/essid.glade.h:10

2
po/el.po
View File

@@ -258,7 +258,7 @@ msgid "Connect with encryption enabled"
msgstr "Σύνδεση με κρυπτογράφηση" msgstr "Σύνδεση με κρυπτογράφηση"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Ασύρματος _Προσαρμογέας" msgstr "Ασύρματος _Προσαρμογέας"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

4
po/en_CA.po
View File

@@ -221,8 +221,8 @@ msgid "Connect with encryption enabled"
msgstr "Connect with encryption enabled" msgstr "Connect with encryption enabled"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Wireless _Adaptor:" msgstr "Wireless _adapter:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10
msgid "Wireless _Network:" msgid "Wireless _Network:"

4
po/en_GB.po
View File

@@ -221,8 +221,8 @@ msgstr "Connect with encryption enabled"
# #
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Wireless _Adaptor:" msgstr "Wireless _adapter:"
# #
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/es.po
View File

@@ -182,7 +182,7 @@ msgid "Connect with encryption enabled"
msgstr "Conexión con encriptado activada" msgstr "Conexión con encriptado activada"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "_Adaptador inalámbrico:" msgstr "_Adaptador inalámbrico:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/fr.po
View File

@@ -224,7 +224,7 @@ msgid "Connect with encryption enabled"
msgstr "Se connecter avec le chiffrement activé" msgstr "Se connecter avec le chiffrement activé"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "_Adaptateur sans fil :" msgstr "_Adaptateur sans fil :"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/gu.po
View File

@@ -111,7 +111,7 @@ msgstr "વાયરલેસ નેટવર્કો"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
#, fuzzy #, fuzzy
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "વાયરલેસ નેટવર્કો" msgstr "વાયરલેસ નેટવર્કો"
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

2
po/hr.po
View File

@@ -174,7 +174,7 @@ msgid "C_onnect"
msgstr "_Spoji se" msgstr "_Spoji se"
#: panel-applet/essid.glade:132 #: panel-applet/essid.glade:132
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Bežični _uređaj:" msgstr "Bežični _uređaj:"
#: panel-applet/essid.glade:172 #: panel-applet/essid.glade:172

2
po/ja.po
View File

@@ -177,7 +177,7 @@ msgid "Connect with encryption enabled"
msgstr "暗号化を有効にして接続" msgstr "暗号化を有効にして接続"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "無線アダプタ(_A):" msgstr "無線アダプタ(_A):"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/mk.po
View File

@@ -180,7 +180,7 @@ msgid "Connect with encryption enabled"
msgstr "Врзување со овозможено кодирање" msgstr "Врзување со овозможено кодирање"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Безжичен _адаптер:" msgstr "Безжичен _адаптер:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/nb.po
View File

@@ -219,7 +219,7 @@ msgid "Connect with encryption enabled"
msgstr "Koble til med kryptering" msgstr "Koble til med kryptering"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Trådløst _kort:" msgstr "Trådløst _kort:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/nl.po
View File

@@ -241,7 +241,7 @@ msgid "Connect with encryption enabled"
msgstr "Verbinden met versleuteling aangezet" msgstr "Verbinden met versleuteling aangezet"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Draadloze adapter:" msgstr "Draadloze adapter:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/no.po
View File

@@ -219,7 +219,7 @@ msgid "Connect with encryption enabled"
msgstr "Koble til med kryptering" msgstr "Koble til med kryptering"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Trådløst _kort:" msgstr "Trådløst _kort:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/pa.po
View File

@@ -106,7 +106,7 @@ msgid "Wireless _Network:"
msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ" msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "" msgstr ""
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

2
po/pt_BR.po
View File

@@ -109,7 +109,7 @@ msgid "Wireless _Network:"
msgstr "_Rede Sem Fio:" msgstr "_Rede Sem Fio:"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "_Adaptador Sem Fio:" msgstr "_Adaptador Sem Fio:"
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

4
po/sk.po
View File

@@ -3,7 +3,7 @@
# This file is distributed under the same license as the NetworkManager package. # This file is distributed under the same license as the NetworkManager package.
# Marcel Telka <marcel@telka.sk>, 2004, 2005. # Marcel Telka <marcel@telka.sk>, 2004, 2005.
# #
# $Id: sk.po,v 1.11 2005/02/11 18:54:32 marcel Exp $ # $Id: sk.po,v 1.12 2005/02/18 18:15:53 dcbw Exp $
# #
msgid "" msgid ""
msgstr "" msgstr ""
@@ -221,7 +221,7 @@ msgid "Connect with encryption enabled"
msgstr "Povolené pripojenie so šifrovaním" msgstr "Povolené pripojenie so šifrovaním"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Bezdrôtový _adaptér:" msgstr "Bezdrôtový _adaptér:"
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

2
po/sq.po
View File

@@ -109,7 +109,7 @@ msgid "Wireless _Network:"
msgstr "Ndrysho Rrjetet Wireless" msgstr "Ndrysho Rrjetet Wireless"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "" msgstr ""
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

4
po/sv.po
View File

@@ -2,7 +2,7 @@
# Copyright (C) 2004 Free Software Foundation, Inc. # Copyright (C) 2004 Free Software Foundation, Inc.
# Christian Rose <menthos@menthos.com>, 2004. # Christian Rose <menthos@menthos.com>, 2004.
# #
# $Id: sv.po,v 1.3 2004/10/19 18:20:04 jrb Exp $ # $Id: sv.po,v 1.4 2005/02/18 18:15:53 dcbw Exp $
# #
msgid "" msgid ""
msgstr "" msgstr ""
@@ -113,7 +113,7 @@ msgstr "Trådlösa nätverk:"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
#, fuzzy #, fuzzy
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Trådlösa nätverk:" msgstr "Trådlösa nätverk:"
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

2
po/wa.po
View File

@@ -112,7 +112,7 @@ msgstr "Rantoeles sins fyis"
#: panel-applet/essid.glade:177 #: panel-applet/essid.glade:177
#, fuzzy #, fuzzy
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "Rantoeles sins fyis" msgstr "Rantoeles sins fyis"
#: panel-applet/menu-info.c:101 #: panel-applet/menu-info.c:101

2
po/zh_CN.po
View File

@@ -150,7 +150,7 @@ msgid "Connect with encryption enabled"
msgstr "启用加密连接" msgstr "启用加密连接"
#: panel-applet/essid.glade.h:9 #: panel-applet/essid.glade.h:9
msgid "Wireless _Adaptor:" msgid "Wireless _adapter:"
msgstr "无线适配器(_A)：" msgstr "无线适配器(_A)："
#: panel-applet/essid.glade.h:10 #: panel-applet/essid.glade.h:10

3
src/Makefile.am
View File

@@ -52,6 +52,9 @@ NetworkManager_CPPFLAGS = \
-DBINDIR=\"$(bindir)\" \ -DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\" \ -DDATADIR=\"$(datadir)\" \
-DARP_DEBUG -DARP_DEBUG
if WITH_GCRYPT
NetworkManager_CPPFLAGS += $(LIBGCRYPT_CFLAGS)
endif
if !WITH_GCRYPT if !WITH_GCRYPT

2
src/NetworkManager.c
View File

@@ -23,7 +23,7 @@
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <dbus/dbus-glib-lowlevel.h> #include <dbus/dbus-glib-lowlevel.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <hal/libhal.h> #include <libhal.h>
#include <getopt.h> #include <getopt.h>
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>

2
src/NetworkManagerDevice.c
View File

@@ -22,7 +22,7 @@
#include <errno.h> #include <errno.h>
#include <glib.h> #include <glib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <hal/libhal.h> #include <libhal.h>
#include <iwlib.h> #include <iwlib.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>

2
src/NetworkManagerDevicePrivate.h
View File

@@ -22,7 +22,7 @@
#include <errno.h> #include <errno.h>
#include <glib.h> #include <glib.h>
#include <dbus/dbus-glib.h> #include <dbus/dbus-glib.h>
#include <hal/libhal.h> #include <libhal.h>
#include <iwlib.h> #include <iwlib.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>

2
src/NetworkManagerMain.h
View File

@@ -25,7 +25,7 @@
#include <glib.h> #include <glib.h>
#include <glib/gthread.h> #include <glib/gthread.h>
#include <dbus/dbus.h> #include <dbus/dbus.h>
#include <hal/libhal.h> #include <libhal.h>
#include "NetworkManager.h" #include "NetworkManager.h"
#include "NetworkManagerAP.h" #include "NetworkManagerAP.h"
#include "nm-named-manager.h" #include "nm-named-manager.h"