system/NetworkManager
system/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager synced 2024-10-07 00:31:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

2004-07-27 Dan Williams <dcbw@redhat.com>

Browse source 
* initscript/.cvsignore
		- Add

	* info-daemon/Makefile.am
		- Install .glade files and keyring.png
		- Fix stupid omission of a \ that caused half the flags not to be
			passed to gcc

	* info-daemon/NetworkManagerInfo.c
		- gtk_signal_connect->g_signal_connect
		- Alert NetworkManagerInfo to new glade file location


git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@24 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Dan Williams 2004-07-27 17:05:24 +00:00
parent 3a05be0ce5
commit 7a4149d5c2
4 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ChangeLog
View file

@ -1,3 +1,17 @@
2004-07-27 Dan Williams <dcbw@redhat.com>
* initscript/.cvsignore
- Add
* info-daemon/Makefile.am
- Install .glade files and keyring.png
- Fix stupid omission of a \ that caused half the flags not to be
passed to gcc
* info-daemon/NetworkManagerInfo.c
- gtk_signal_connect->g_signal_connect
- Alert NetworkManagerInfo to new glade file location
2004-07-27 Dan Williams <dcbw@redhat.com>
* test/nmclienttest.c

24
info-daemon/Makefile.am
View file

@ -1,12 +1,15 @@
INCLUDES = \
$(NM_CFLAGS) \
$(GLADE_CFLAGS) \
$(GCONF_CFLAGS)
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DBINDIR=\"$(bindir)\" \
gladedir = $(datadir)/NetworkManagerInfo/glade
INCLUDES = \
$(NM_CFLAGS) \
$(GLADE_CFLAGS) \
$(GCONF_CFLAGS) \
-Wall \
-DDBUS_API_SUBJECT_TO_CHANGE \
-DG_DISABLE_DEPRECATED \
-DGTK_DISABLE_DEPRECATED \
-DGLADEDIR=\""$(datadir)/NetworkManagerInfo/glade"\" \
-DBINDIR=\"$(bindir)\" \
-DDATADIR=\"$(datadir)\"
bin_PROGRAMS = NetworkManagerInfo
@ -16,3 +19,6 @@ NetworkManagerInfo_SOURCES = NetworkManagerInfo.c \
NetworkManagerInfo_LDADD = $(NM_LIBS) $(GLADE_LIBS) $(GCONF_LIBS)
glade_DATA = passphrase.glade keyring.png
EXTRA_DIST = $(glade_DATA)

10
info-daemon/NetworkManagerInfo.c
View file

@ -189,7 +189,7 @@ static void nmi_interface_init (NMIAppInfo *info)
GtkButton *cancel_button;
GtkEntry *entry;
info->xml = glade_xml_new("passphrase.glade", NULL, NULL);
info->xml = glade_xml_new(GLADEDIR"/passphrase.glade", NULL, NULL);
if (!info->xml)
{
fprintf (stderr, "Could not open glade file!\n");
@ -200,10 +200,10 @@ static void nmi_interface_init (NMIAppInfo *info)
gtk_widget_hide (dialog);
ok_button = GTK_BUTTON (glade_xml_get_widget (info->xml, "login_button"));
gtk_signal_connect (GTK_OBJECT (ok_button), "clicked", GTK_SIGNAL_FUNC (ok_button_clicked), info);
g_signal_connect (GTK_OBJECT (ok_button), "clicked", GTK_SIGNAL_FUNC (ok_button_clicked), info);
gtk_widget_grab_default (GTK_WIDGET (ok_button));
cancel_button = GTK_BUTTON (glade_xml_get_widget (info->xml, "cancel_button"));
gtk_signal_connect (GTK_OBJECT (cancel_button), "clicked", GTK_SIGNAL_FUNC (cancel_button_clicked), info);
g_signal_connect (GTK_OBJECT (cancel_button), "clicked", GTK_SIGNAL_FUNC (cancel_button_clicked), info);
entry = GTK_ENTRY (glade_xml_get_widget (info->xml, "passphrase_entry"));
gtk_entry_set_visibility (entry, FALSE);
@ -237,9 +237,7 @@ void nmi_gconf_notify_callback (GConfClient *client, guint connection_id, GConfE
gconf_path_len = strlen (NMI_GCONF_ALLOWED_NETWORKS_PATH) + 1;
/* Extract the network name from the key */
if (strncmp ( NMI_GCONF_ALLOWED_NETWORKS_PATH
"/",
key, gconf_path_len) == 0)
if (strncmp (NMI_GCONF_ALLOWED_NETWORKS_PATH"/", key, gconf_path_len) == 0)
{
char *network = g_strdup ((key + gconf_path_len));
char *slash_pos;

2
initscript/.cvsignore Normal file
View file

@ -0,0 +1,2 @@
Makefile
Makefile.in