fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-02-04 02:30:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

2006-01-23 Robert Love <rml@novell.com>

Browse source 
* Makefile.am, nm-applet.desktop: Add autostart .desktop file, now that
	  gnome-session does autostart.  TODO: We need to install this to
	  $prefix/share/autostart/.


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@1379 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Robert Love 2006-01-23 20:33:45 +00:00 • committed by Robert Love
parent eb607190f9
commit d51874eca6
3 changed files with 48 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-01-23 Robert Love <rml@novell.com>
* Makefile.am, nm-applet.desktop: Add autostart .desktop file, now that
gnome-session does autostart. TODO: We need to install this to
$prefix/share/autostart/.
2006-01-22 Dan Williams <dcbw@redhat.com>
* src/NetworkManagerAP.[ch]

3
Makefile.am
View file

@ -15,7 +15,8 @@ EXTRA_DIST = \
NetworkManager.pc.in \
intltool-extract.in \
intltool-merge.in \
intltool-update.in
intltool-update.in \
nm-applet.desktop
DISTCLEANFILES = intltool-extract intltool-merge intltool-update

40
gnome/applet/applet.c
View file

@ -1758,10 +1758,42 @@ static void nmwa_menu_add_vpn_menu (GtkWidget *menu, NMWirelessApplet *applet)
}
static void nmwa_config_dialup_cb (GtkMenu *item, gpointer data)
{
char *modem_argv[] = { "/opt/gnome/bin/gnomesu", "/sbin/yast2", "modem", NULL };
char *isdn_argv[] = { "/opt/gnome/bin/gnomesu", "/sbin/yast2", "isdn", NULL };
char **argv;
gboolean modem = (gboolean) data;
GError *err = NULL;
if (modem)
argv = modem_argv;
else
argv = isdn_argv;
if (!g_spawn_async ("/", argv, NULL, 0, NULL, NULL, NULL, &err))
{
GtkWidget *dialog;
char *msg;
msg = g_strdup_printf ("<span weight=\"bold\" size=\"larger\">%s</span>\n\n%s",
_("Dialup configuration could not be run"), err->message);
dialog = gtk_message_dialog_new_with_markup (NULL, 0, GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, msg);
gtk_dialog_run (GTK_DIALOG (dialog));
gtk_widget_destroy (dialog);
g_free (msg);
g_error_free (err);
}
}
static void nmwa_menu_add_dialup_menu (GtkWidget *menu, NMWirelessApplet *applet)
{
GtkMenuItem *item;
GtkMenu *dialup_menu;
GtkWidget *configure_item;
GSList *elt;
g_return_if_fail (menu != NULL);
@ -1791,6 +1823,14 @@ static void nmwa_menu_add_dialup_menu (GtkWidget *menu, NMWirelessApplet *applet
gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), GTK_WIDGET (disconnect_item));
}
configure_item = gtk_menu_item_new_with_mnemonic (_("Configure _Modem..."));
g_signal_connect (G_OBJECT (configure_item), "activate", G_CALLBACK (nmwa_config_dialup_cb), (gpointer) 1);
gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), configure_item);
configure_item = gtk_menu_item_new_with_mnemonic (_("Configure _ISDN..."));
g_signal_connect (G_OBJECT (configure_item), "activate", G_CALLBACK (nmwa_config_dialup_cb), (gpointer) 0);
gtk_menu_shell_append (GTK_MENU_SHELL (dialup_menu), configure_item);
gtk_menu_item_set_submenu (item, GTK_WIDGET (dialup_menu));
gtk_menu_shell_append (GTK_MENU_SHELL (menu), GTK_WIDGET (item));
gtk_widget_show_all (GTK_WIDGET (item));