From 6411cc5adee37406ad7c8b6a906a2c73daefd48e Mon Sep 17 00:00:00 2001 From: Dan Williams Date: Fri, 18 Feb 2005 18:15:54 +0000 Subject: [PATCH] 2005-02-18 Dan Williams * panel-applet/essid.glade panel-applet/NMWirelessAppletOtherNetworksDialog.c - Correct spelling of "adaptor"->"adapter" 2005-02-18 William Jon McCann * 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 * 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 --- ChangeLog | 20 ++++ panel-applet/Makefile.am | 25 ++--- panel-applet/NMWirelessApplet.c | 97 ++++++++++--------- panel-applet/NMWirelessApplet.h | 2 +- .../NMWirelessAppletOtherNetworkDialog.c | 22 ++--- panel-applet/essid.glade | 18 ++-- panel-applet/menu-info.c | 3 +- po/ChangeLog | 4 + po/bs.po | 2 +- po/cs.po | 2 +- po/da.po | 2 +- po/de.po | 2 +- po/el.po | 2 +- po/en_CA.po | 4 +- po/en_GB.po | 4 +- po/es.po | 2 +- po/fr.po | 2 +- po/gu.po | 2 +- po/hr.po | 2 +- po/ja.po | 2 +- po/mk.po | 2 +- po/nb.po | 2 +- po/nl.po | 2 +- po/no.po | 2 +- po/pa.po | 2 +- po/pt_BR.po | 2 +- po/sk.po | 4 +- po/sq.po | 2 +- po/sv.po | 4 +- po/wa.po | 2 +- po/zh_CN.po | 2 +- src/Makefile.am | 3 + src/NetworkManager.c | 2 +- src/NetworkManagerDevice.c | 2 +- src/NetworkManagerDevicePrivate.h | 2 +- src/NetworkManagerMain.h | 2 +- 36 files changed, 145 insertions(+), 111 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5808265659..7568845594 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2005-02-18 Dan Williams + + * panel-applet/essid.glade + panel-applet/NMWirelessAppletOtherNetworksDialog.c + - Correct spelling of "adaptor"->"adapter" + +2005-02-18 William Jon McCann + + * 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 + + * panel-applet/essid.glade: Capitalize items as per HIG. + Fixes #167632 + 2005-02-16 William Jon McCann * panel-applet/gtkcellrendererprogress.[ch]: Only compile these diff --git a/panel-applet/Makefile.am b/panel-applet/Makefile.am index 914abb20b6..f535a374c4 100644 --- a/panel-applet/Makefile.am +++ b/panel-applet/Makefile.am @@ -7,20 +7,24 @@ INCLUDES = -I${top_srcdir} noinst_LTLIBRARIES = libnm_notification_applet.la -libnm_notification_applet_la_CPPFLAGS = \ - $(DBUS_CFLAGS) \ - $(GTHREAD_CFLAGS) \ - $(HAL_CFLAGS) \ - $(DBUS_GLIB_CFLAGS) \ +gladedir = $(datadir)/NetworkManagerNotification +glade_DATA = essid.glade + +libnm_notification_applet_la_CPPFLAGS = \ + $(DBUS_CFLAGS) \ + $(GTHREAD_CFLAGS) \ + $(HAL_CFLAGS) \ + $(DBUS_GLIB_CFLAGS) \ $(GLADE_CFLAGS) \ - $(GTK_CFLAGS) \ + $(GTK_CFLAGS) \ $(GCONF_CFLAGS) \ $(LIBGNOMEUI_CFLAGS) \ $(PANEL_APPLET_CFLAGS) \ -DICONDIR=\""$(datadir)/pixmaps"\" \ + -DGLADEDIR=\""$(gladedir)"\" \ -DDBUS_API_SUBJECT_TO_CHANGE \ -DG_DISABLE_DEPRECATED \ - -DGDK_DISABLE_DEPRECATED \ + -DGDK_DISABLE_DEPRECATED \ -DGNOME_DISABLE_DEPRECATED \ -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \ -DVERSION=\"$(VERSION)\" \ @@ -48,10 +52,10 @@ libnm_notification_applet_la_SOURCES += \ libnm_notification_applet_la_LIBADD = \ $(DBUS_LIBS) \ $(HAL_LIBS) \ - $(GTHREAD_LIBS) \ + $(GTHREAD_LIBS) \ $(GLADE_LIBS) \ $(DBUS_GLIB_LIBS) \ - $(PANEL_APPLET_LIBS) \ + $(PANEL_APPLET_LIBS) \ $(GTK_LIBS) \ $(GCONF_LIBS) \ $(LIBGNOMEUI_LIBS) \ @@ -63,9 +67,6 @@ NetworkManagerNotification_CFLAGS = $(libnm_notification_applet_la_CPPFLAGS) NetworkManagerNotification_SOURCES = main.c NetworkManagerNotification_LDADD = ./libnm_notification_applet.la -gladedir = $(datadir)/NetworkManagerNotification -glade_DATA = essid.glade - CLEANFILES = $(server_DATA) *.bak *.gladep EXTRA_DIST = \ diff --git a/panel-applet/NMWirelessApplet.c b/panel-applet/NMWirelessApplet.c index 64cf11caaa..3c513cefd4 100644 --- a/panel-applet/NMWirelessApplet.c +++ b/panel-applet/NMWirelessApplet.c @@ -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 * * Dan Williams @@ -39,10 +40,15 @@ #include #include #include - -#include +#include #include +#include + +#if !GTK_CHECK_VERSION(2,6,0) +#include +#endif + #include #include @@ -76,36 +82,36 @@ G_DEFINE_TYPE(NMWirelessApplet, nmwa, EGG_TYPE_TRAY_ICON) static void nmwa_init (NMWirelessApplet *applet) { - applet->animation_id = 0; - applet->animation_step = 0; + applet->animation_id = 0; + applet->animation_step = 0; - setup_stock (); - nmwa_icons_init (applet); - nmwa_fill (applet); + setup_stock (); + nmwa_icons_init (applet); + nmwa_fill (applet); } 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, - guint n_props, - GObjectConstructParam *construct_props) + guint n_props, + GObjectConstructParam *construct_props) { - GObject *obj; - NMWirelessApplet *applet; - NMWirelessAppletClass *klass; + GObject *obj; + NMWirelessApplet *applet; + NMWirelessAppletClass *klass; - klass = NM_WIRELESS_APPLET_CLASS (g_type_class_peek (type)); - obj = G_OBJECT_CLASS (nmwa_parent_class)->constructor (type, n_props, construct_props); - applet = NM_WIRELESS_APPLET (obj); + klass = NM_WIRELESS_APPLET_CLASS (g_type_class_peek (type)); + obj = G_OBJECT_CLASS (nmwa_parent_class)->constructor (type, n_props, construct_props); + applet = NM_WIRELESS_APPLET (obj); - return obj; + return obj; } @@ -117,7 +123,7 @@ void nmwa_about_cb (NMWirelessApplet *applet) static const gchar *authors[] = { - "\nThe Red Hat Desktop Team, including:\n", + "The Red Hat Desktop Team, including:\n", "Dan Williams ", "Jonathan Blandford ", "John Palmieri ", @@ -130,21 +136,20 @@ void nmwa_about_cb (NMWirelessApplet *applet) 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 */ file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_PIXMAP, "gnome-networktool.png", FALSE, NULL); pixbuf = gdk_pixbuf_new_from_file (file, NULL); g_free (file); - about_dialog = gnome_about_new ( - _("NetworkManager Applet"), - VERSION, - _("(C) 2004-2005 Red Hat, Inc."), - _("A panel application for managing your network devices & connections."), - authors, - documenters, - NULL, - pixbuf); + about_dialog = gnome_about_new (_("NetworkManager Applet"), + VERSION, + _("Copyright \xc2\xa9 2004-2005 Red Hat, Inc."), + _("Notification area applet for managing your network devices and connections."), + authors, + documenters, + NULL, + pixbuf); g_object_unref (pixbuf); 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_show_about_dialog (NULL, - "name", _("NetworkManager Applet"), - "version", VERSION, - "copyright", _("(C) 2004-2005 by Red Hat, Inc."), - "comments", _("A panel application for managing your network devices & connections."), - "authors", authors, - "documenters", documenters, - "translator-credits", NULL, - "logo-icon-name", GTK_STOCK_NETWORK, - NULL); + "name", _("NetworkManager Applet"), + "version", VERSION, + "copyright", _("Copyright \xc2\xa9 2004-2005 Red Hat, Inc."), + "comments", _("Notification area applet for managing your network devices and connections."), + "authors", authors, + "documenters", documenters, + "translator-credits", NULL, + "logo-icon-name", GTK_STOCK_NETWORK, + NULL); #endif } @@ -341,8 +346,8 @@ nmwa_update_state (NMWirelessApplet *applet) WirelessNetwork *active_network = NULL; g_mutex_lock (applet->data_mutex); - if ( applet->active_device - && (applet->active_device->type == DEVICE_TYPE_WIRELESS_ETHERNET)) + if (applet->active_device + && (applet->active_device->type == DEVICE_TYPE_WIRELESS_ETHERNET)) { 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 * */ -static void nmwa_toplevel_menu_activate (GtkWidget *menu, NMWirelessApplet *applet) +static void nmwa_menu_show_cb (GtkWidget *menu, NMWirelessApplet *applet) { if (!applet->tooltips) 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_add (GTK_CONTAINER(applet->toplevel_menu), applet->pixmap); 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); g_signal_connect (applet->toplevel_menu, "button_press_event", G_CALLBACK (nmwa_toplevel_menu_button_press), applet); - applet->menu = gtk_menu_new(); - gtk_menu_item_set_submenu (GTK_MENU_ITEM(applet->toplevel_menu), applet->menu); + applet->menu = gtk_menu_new (); + 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); diff --git a/panel-applet/NMWirelessApplet.h b/panel-applet/NMWirelessApplet.h index fa8ef49fd3..13a27c6488 100644 --- a/panel-applet/NMWirelessApplet.h +++ b/panel-applet/NMWirelessApplet.h @@ -21,7 +21,7 @@ #ifndef NM_WIRELESS_APPLET_H #define NM_WIRELESS_APPLET_H -#include +#include #include #include #include diff --git a/panel-applet/NMWirelessAppletOtherNetworkDialog.c b/panel-applet/NMWirelessAppletOtherNetworkDialog.c index d607f9136c..f3b911d3a9 100644 --- a/panel-applet/NMWirelessAppletOtherNetworkDialog.c +++ b/panel-applet/NMWirelessAppletOtherNetworkDialog.c @@ -33,8 +33,8 @@ #include #include -#include #include +#include #include #include "NetworkManager.h" @@ -98,7 +98,7 @@ static void update_button_cb (GtkWidget *widget, GladeXML *xml) 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; GSList *element; @@ -214,6 +214,7 @@ static GtkDialog *nmwa_other_network_dialog_init (GladeXML *xml, NMWirelessApple /* Set up the 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"); 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) { - gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adaptor_label")); - gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adaptor_combo")); + gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adapter_label")); + gtk_widget_hide (glade_xml_get_widget (xml, "wireless_adapter_combo")); } else { GtkWidget *combo; GtkTreeModel *model; - combo = glade_xml_get_widget (xml, "wireless_adaptor_combo"); - model = create_wireless_adaptor_model (applet); + combo = glade_xml_get_widget (xml, "wireless_adapter_combo"); + model = create_wireless_adapter_model (applet); gtk_combo_box_set_model (GTK_COMBO_BOX (combo), model); /* 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) { gchar *glade_file; - GtkDialog *dialog; - GladeXML *xml; - gint response; + GtkDialog *dialog; + GladeXML *xml; + gint response; NetworkDevice *def_dev = NULL; g_return_if_fail (applet != NULL); - glade_file = gnome_program_locate_file (NULL, GNOME_FILE_DOMAIN_DATADIR, - "NetworkManagerNotification/essid.glade", FALSE, NULL); + glade_file = g_build_filename (GLADEDIR, "essid.glade", NULL); if (!glade_file || !g_file_test (glade_file, G_FILE_TEST_IS_REGULAR)) { diff --git a/panel-applet/essid.glade b/panel-applet/essid.glade index 6aac7208cb..053361dffd 100644 --- a/panel-applet/essid.glade +++ b/panel-applet/essid.glade @@ -126,9 +126,9 @@ 6 - + True - Wireless _Adaptor: + Wireless _adapter: True False GTK_JUSTIFY_LEFT @@ -138,7 +138,7 @@ 0.5 0 0 - wireless_adaptor_combo + wireless_adapter_combo 0 @@ -151,7 +151,7 @@ - + True @@ -168,7 +168,7 @@ True - Wireless _Network: + Wireless _network: True False GTK_JUSTIFY_LEFT @@ -242,7 +242,7 @@ True - Key Type: + Key type: False False GTK_JUSTIFY_LEFT @@ -311,9 +311,9 @@ True - 128-bit Passphrase (WEP) -Ascii Key (WEP) -Hex Key (WEP) + 128-bit passphrase (WEP) +Ascii key (WEP) +Hex key (WEP) 1 diff --git a/panel-applet/menu-info.c b/panel-applet/menu-info.c index 3bbc7770bb..cc9e9fb24c 100644 --- a/panel-applet/menu-info.c +++ b/panel-applet/menu-info.c @@ -36,9 +36,9 @@ #if (GTK_MAJOR_VERSION <= 2 && GTK_MINOR_VERSION < 6) #include "gtkcellview.h" +#include "gtkcellrendererprogress.h" #endif -#include "gtkcellrendererprogress.h" #include "NMWirelessAppletDbus.h" 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, "text", "", 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_RENDERER (menu_info->progress_bar), TRUE); diff --git a/po/ChangeLog b/po/ChangeLog index c5c6777d1d..4c84d37364 100644 --- a/po/ChangeLog +++ b/po/ChangeLog @@ -1,3 +1,7 @@ +2005-02-18 Dan Williams + + * Correct spelling of "adaptor"->"adapter" + 2005-02-18 Kjartan Maraas * nb.po: Update diff --git a/po/bs.po b/po/bs.po index 4ecf2500c0..5e97139169 100644 --- a/po/bs.po +++ b/po/bs.po @@ -112,7 +112,7 @@ msgstr "Wireless Mreže" #: panel-applet/essid.glade:177 #, fuzzy -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Wireless Mreže" #: panel-applet/menu-info.c:101 diff --git a/po/cs.po b/po/cs.po index 98703439fe..d7ae67dfa9 100644 --- a/po/cs.po +++ b/po/cs.po @@ -220,7 +220,7 @@ msgid "Connect with encryption enabled" msgstr "Připojit se s povoleným šifrováním" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Bezdrátový _adaptér:" #: panel-applet/essid.glade.h:10 diff --git a/po/da.po b/po/da.po index bebb04172d..fc04bd441d 100644 --- a/po/da.po +++ b/po/da.po @@ -111,7 +111,7 @@ msgid "Wireless _Network:" msgstr "Ændre trådløse netværk" #: panel-applet/essid.glade:177 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "" #: panel-applet/menu-info.c:101 diff --git a/po/de.po b/po/de.po index dc719e0ebc..c581130804 100644 --- a/po/de.po +++ b/po/de.po @@ -232,7 +232,7 @@ msgid "Connect with encryption enabled" msgstr "Verschlüsselte Verbindung ist aktiv" #: ../panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Funknetzwerk_adapter:" #: ../panel-applet/essid.glade.h:10 diff --git a/po/el.po b/po/el.po index e23cac32bf..ca153d33ca 100644 --- a/po/el.po +++ b/po/el.po @@ -258,7 +258,7 @@ msgid "Connect with encryption enabled" msgstr "Σύνδεση με κρυπτογράφηση" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Ασύρματος _Προσαρμογέας" #: panel-applet/essid.glade.h:10 diff --git a/po/en_CA.po b/po/en_CA.po index ae37ddd8ad..2624cb17af 100644 --- a/po/en_CA.po +++ b/po/en_CA.po @@ -221,8 +221,8 @@ msgid "Connect with encryption enabled" msgstr "Connect with encryption enabled" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" -msgstr "Wireless _Adaptor:" +msgid "Wireless _adapter:" +msgstr "Wireless _adapter:" #: panel-applet/essid.glade.h:10 msgid "Wireless _Network:" diff --git a/po/en_GB.po b/po/en_GB.po index 7745bc08f2..f2f101973e 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -221,8 +221,8 @@ msgstr "Connect with encryption enabled" # #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" -msgstr "Wireless _Adaptor:" +msgid "Wireless _adapter:" +msgstr "Wireless _adapter:" # #: panel-applet/essid.glade.h:10 diff --git a/po/es.po b/po/es.po index 7b44da0442..78c4dbab6f 100644 --- a/po/es.po +++ b/po/es.po @@ -182,7 +182,7 @@ msgid "Connect with encryption enabled" msgstr "Conexión con encriptado activada" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "_Adaptador inalámbrico:" #: panel-applet/essid.glade.h:10 diff --git a/po/fr.po b/po/fr.po index db7e3c8d8a..8ac832baad 100644 --- a/po/fr.po +++ b/po/fr.po @@ -224,7 +224,7 @@ msgid "Connect with encryption enabled" msgstr "Se connecter avec le chiffrement activé" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "_Adaptateur sans fil :" #: panel-applet/essid.glade.h:10 diff --git a/po/gu.po b/po/gu.po index 97732bf483..b44ba6256b 100644 --- a/po/gu.po +++ b/po/gu.po @@ -111,7 +111,7 @@ msgstr "વાયરલેસ નેટવર્કો" #: panel-applet/essid.glade:177 #, fuzzy -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "વાયરલેસ નેટવર્કો" #: panel-applet/menu-info.c:101 diff --git a/po/hr.po b/po/hr.po index 8deda87986..3ddfd37d32 100644 --- a/po/hr.po +++ b/po/hr.po @@ -174,7 +174,7 @@ msgid "C_onnect" msgstr "_Spoji se" #: panel-applet/essid.glade:132 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Bežični _uređaj:" #: panel-applet/essid.glade:172 diff --git a/po/ja.po b/po/ja.po index 5a320b2701..0b9f05b37f 100644 --- a/po/ja.po +++ b/po/ja.po @@ -177,7 +177,7 @@ msgid "Connect with encryption enabled" msgstr "暗号化を有効にして接続" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "無線アダプタ(_A):" #: panel-applet/essid.glade.h:10 diff --git a/po/mk.po b/po/mk.po index 447168a0fb..30ac1d46d5 100644 --- a/po/mk.po +++ b/po/mk.po @@ -180,7 +180,7 @@ msgid "Connect with encryption enabled" msgstr "Врзување со овозможено кодирање" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Безжичен _адаптер:" #: panel-applet/essid.glade.h:10 diff --git a/po/nb.po b/po/nb.po index 60107995f0..69d77f1b50 100644 --- a/po/nb.po +++ b/po/nb.po @@ -219,7 +219,7 @@ msgid "Connect with encryption enabled" msgstr "Koble til med kryptering" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Trådløst _kort:" #: panel-applet/essid.glade.h:10 diff --git a/po/nl.po b/po/nl.po index 83db73220e..9286649dd7 100644 --- a/po/nl.po +++ b/po/nl.po @@ -241,7 +241,7 @@ msgid "Connect with encryption enabled" msgstr "Verbinden met versleuteling aangezet" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Draadloze adapter:" #: panel-applet/essid.glade.h:10 diff --git a/po/no.po b/po/no.po index 60107995f0..69d77f1b50 100644 --- a/po/no.po +++ b/po/no.po @@ -219,7 +219,7 @@ msgid "Connect with encryption enabled" msgstr "Koble til med kryptering" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Trådløst _kort:" #: panel-applet/essid.glade.h:10 diff --git a/po/pa.po b/po/pa.po index 0fd5ee23ca..b5dab15db1 100644 --- a/po/pa.po +++ b/po/pa.po @@ -106,7 +106,7 @@ msgid "Wireless _Network:" msgstr "ਬੇਤਾਰ ਨੈੱਟਵਰਕ ਸੋਧ" #: panel-applet/essid.glade:177 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "" #: panel-applet/menu-info.c:101 diff --git a/po/pt_BR.po b/po/pt_BR.po index 121db9a4b8..ba58d4dd46 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -109,7 +109,7 @@ msgid "Wireless _Network:" msgstr "_Rede Sem Fio:" #: panel-applet/essid.glade:177 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "_Adaptador Sem Fio:" #: panel-applet/menu-info.c:101 diff --git a/po/sk.po b/po/sk.po index 21aac26e34..291dd4af4d 100644 --- a/po/sk.po +++ b/po/sk.po @@ -3,7 +3,7 @@ # This file is distributed under the same license as the NetworkManager package. # Marcel Telka , 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 "" msgstr "" @@ -221,7 +221,7 @@ msgid "Connect with encryption enabled" msgstr "Povolené pripojenie so šifrovaním" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Bezdrôtový _adaptér:" #: panel-applet/essid.glade.h:10 diff --git a/po/sq.po b/po/sq.po index 5e636ee235..b425d1e3fa 100644 --- a/po/sq.po +++ b/po/sq.po @@ -109,7 +109,7 @@ msgid "Wireless _Network:" msgstr "Ndrysho Rrjetet Wireless" #: panel-applet/essid.glade:177 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "" #: panel-applet/menu-info.c:101 diff --git a/po/sv.po b/po/sv.po index 1a1df281c2..2274ee4923 100644 --- a/po/sv.po +++ b/po/sv.po @@ -2,7 +2,7 @@ # Copyright (C) 2004 Free Software Foundation, Inc. # Christian Rose , 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 "" msgstr "" @@ -113,7 +113,7 @@ msgstr "Trådlösa nätverk:" #: panel-applet/essid.glade:177 #, fuzzy -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Trådlösa nätverk:" #: panel-applet/menu-info.c:101 diff --git a/po/wa.po b/po/wa.po index d5ba2b8397..41bccf2a6a 100644 --- a/po/wa.po +++ b/po/wa.po @@ -112,7 +112,7 @@ msgstr "Rantoeles sins fyis" #: panel-applet/essid.glade:177 #, fuzzy -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "Rantoeles sins fyis" #: panel-applet/menu-info.c:101 diff --git a/po/zh_CN.po b/po/zh_CN.po index 9d0411a371..a6414bea23 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -150,7 +150,7 @@ msgid "Connect with encryption enabled" msgstr "启用加密连接" #: panel-applet/essid.glade.h:9 -msgid "Wireless _Adaptor:" +msgid "Wireless _adapter:" msgstr "无线适配器(_A)：" #: panel-applet/essid.glade.h:10 diff --git a/src/Makefile.am b/src/Makefile.am index 47050cb52e..2da17f00cd 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -52,6 +52,9 @@ NetworkManager_CPPFLAGS = \ -DBINDIR=\"$(bindir)\" \ -DDATADIR=\"$(datadir)\" \ -DARP_DEBUG +if WITH_GCRYPT +NetworkManager_CPPFLAGS += $(LIBGCRYPT_CFLAGS) +endif if !WITH_GCRYPT diff --git a/src/NetworkManager.c b/src/NetworkManager.c index fce0606736..558c19eb6d 100644 --- a/src/NetworkManager.c +++ b/src/NetworkManager.c @@ -23,7 +23,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/NetworkManagerDevice.c b/src/NetworkManagerDevice.c index 79fc3b018f..0ac73367c7 100644 --- a/src/NetworkManagerDevice.c +++ b/src/NetworkManagerDevice.c @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/NetworkManagerDevicePrivate.h b/src/NetworkManagerDevicePrivate.h index 0456e107bb..16d6948c56 100644 --- a/src/NetworkManagerDevicePrivate.h +++ b/src/NetworkManagerDevicePrivate.h @@ -22,7 +22,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/src/NetworkManagerMain.h b/src/NetworkManagerMain.h index 094de7489f..18b424eb77 100644 --- a/src/NetworkManagerMain.h +++ b/src/NetworkManagerMain.h @@ -25,7 +25,7 @@ #include #include #include -#include +#include #include "NetworkManager.h" #include "NetworkManagerAP.h" #include "nm-named-manager.h"