mirror of
https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git
synced 2026-01-11 09:50:22 +01:00
2007-08-13 Tambet Ingo <tambet@gmail.com>
* gnome/*: Remove. The nm-vpn-properties directory is now part
* of nm-applet,
libnm_glib directory got merged with libnm-glib/.
git-svn-id: http://svn-archive.gnome.org/svn/NetworkManager/trunk@2670 4912f4e0-d625-0410-9fb7-b9a5a253dbdc
This commit is contained in:
Tambet Ingo
parent
fbe9becbd4
commit
f207faf783
13 changed files with 3 additions and 1738 deletions
|
|
@ -1,5 +1,8 @@
|
|||
2007-08-13 Tambet Ingo <tambet@gmail.com>
|
||||
|
||||
* gnome/*: Remove. The nm-vpn-properties directory is now part of nm-applet,
|
||||
libnm_glib directory got merged with libnm-glib/.
|
||||
|
||||
* libnm-glib/libnm-glib.pc.in: Rename to libnm_glib.pc.in.
|
||||
|
||||
* libnm-glib/Makefile.am: Add legacy libnm_glib.[ch] to the build.
|
||||
|
|
|
|||
|
|
@ -1,2 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
if WITH_GNOME
|
||||
SUBDIRS = libnm_glib vpn-properties
|
||||
else
|
||||
SUBDIRS = libnm_glib
|
||||
endif
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
libnm_glib.pc
|
||||
Makefile.in
|
||||
Makefile
|
||||
|
|
@ -1,31 +0,0 @@
|
|||
INCLUDES = -I${top_srcdir} -I${top_srcdir}/utils -I${top_srcdir}/include
|
||||
|
||||
lib_LTLIBRARIES=libnm_glib.la
|
||||
|
||||
libnm_glib_la_CPPFLAGS = \
|
||||
$(DBUS_CFLAGS) \
|
||||
$(GTHREAD_CFLAGS) \
|
||||
-DDBUS_API_SUBJECT_TO_CHANGE
|
||||
|
||||
libnm_glib_la_SOURCES= \
|
||||
libnm_glib.c \
|
||||
libnm_glib.h
|
||||
|
||||
libnm_glib_la_LDFLAGS= \
|
||||
$(DBUS_LIBS) \
|
||||
$(GTHREAD_LIBS)
|
||||
|
||||
libnm_glib_la_LIBADD = $(top_builddir)/utils/libnmutils.la
|
||||
|
||||
libnm_glib_includedir=$(includedir)/NetworkManager
|
||||
|
||||
libnm_glib_include_HEADERS = libnm_glib.h
|
||||
|
||||
pkgconfigdir = $(libdir)/pkgconfig
|
||||
pkgconfig_DATA = libnm_glib.pc
|
||||
|
||||
DISTCLEANFILES = \
|
||||
libnm_glib.pc
|
||||
|
||||
EXTRA_DIST = \
|
||||
libnm_glib.pc.in
|
||||
|
|
@ -1,13 +0,0 @@
|
|||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
libdir=@libdir@
|
||||
includedir=@includedir@
|
||||
|
||||
Name: libnm_glib
|
||||
Description: Client library for determining network connection properties from NetworkManager, using glib
|
||||
Version: @VERSION@
|
||||
Requires: dbus-1 glib-2.0 dbus-glib-1
|
||||
Cflags: -DDBUS_API_SUBJECT_TO_CHANGE -I${includedir}/NetworkManager
|
||||
Libs: -L${libdir} -lnm_glib
|
||||
|
||||
|
||||
|
|
@ -1,3 +0,0 @@
|
|||
Makefile
|
||||
Makefile.in
|
||||
nm-vpn-properties
|
||||
|
|
@ -1,48 +0,0 @@
|
|||
|
||||
bin_PROGRAMS = nm-vpn-properties
|
||||
|
||||
nm_vpn_propertiesdir=$(includedir)/NetworkManager
|
||||
|
||||
nm_vpn_properties_HEADERS = \
|
||||
nm-vpn-ui-interface.h
|
||||
|
||||
nm_vpn_properties_SOURCES = \
|
||||
nm-vpn-properties.c \
|
||||
clipboard.c \
|
||||
clipboard.h \
|
||||
nm-vpn-ui-interface.h
|
||||
|
||||
gladedir = $(datadir)/gnome-vpn-properties
|
||||
glade_DATA = nm-vpn-properties.glade
|
||||
|
||||
nm_vpn_properties_CFLAGS = \
|
||||
$(GLADE_CFLAGS) \
|
||||
$(GTK_CFLAGS) \
|
||||
$(GCONF_CFLAGS) \
|
||||
$(GMODULE_CFLAGS) \
|
||||
$(LIBGNOMEUI_CFLAGS) \
|
||||
-DSYSCONFDIR=\"$(sysconfdir)\" \
|
||||
-DICONDIR=\""$(datadir)/icons"\" \
|
||||
-DGLADEDIR=\""$(gladedir)"\" \
|
||||
-DG_DISABLE_DEPRECATED \
|
||||
-DGDK_DISABLE_DEPRECATED \
|
||||
-DGNOMELOCALEDIR=\"$(datadir)/locale\" \
|
||||
-DVERSION=\"$(VERSION)\" \
|
||||
$(NULL)
|
||||
|
||||
nm_vpn_properties_LDADD = \
|
||||
$(GLADE_LIBS) \
|
||||
$(GTK_LIBS) \
|
||||
$(GCONF_LIBS) \
|
||||
$(GMODULE_LIBS) \
|
||||
$(LIBGNOMEUI_LIBS) \
|
||||
$(NULL)
|
||||
|
||||
CLEANFILES = $(server_DATA) *.bak *.gladep *~
|
||||
|
||||
EXTRA_DIST = \
|
||||
$(glade_DATA) \
|
||||
$(NULL)
|
||||
|
||||
|
||||
|
||||
|
|
@ -1,74 +0,0 @@
|
|||
/*
|
||||
* src/clipboard.c - X clipboard hack to detect if daemon is running
|
||||
*
|
||||
* Elliot Lee <sopwith@redhat.com>
|
||||
*
|
||||
* (C) Copyright 1999 Red Hat, Inc.
|
||||
*
|
||||
* Licensed under the GNU GPL v2. See COPYING.
|
||||
*/
|
||||
|
||||
#include "config.h"
|
||||
|
||||
#include <gnome.h>
|
||||
#include <gconf/gconf-client.h>
|
||||
#include <gdk/gdkx.h>
|
||||
|
||||
#include "clipboard.h"
|
||||
|
||||
/*
|
||||
* clipboard_get_func - dummy get_func for gtk_clipboard_set_with_data ()
|
||||
*/
|
||||
static void
|
||||
clipboard_get_func (GtkClipboard *clipboard __attribute__((__unused__)),
|
||||
GtkSelectionData *selection_data __attribute__((__unused__)),
|
||||
guint info __attribute__((__unused__)),
|
||||
gpointer user_data_or_owner __attribute__((__unused__)))
|
||||
{
|
||||
}
|
||||
|
||||
/*
|
||||
* clipboard_clear_func - dummy clear_func for gtk_clipboard_set_with_data ()
|
||||
*/
|
||||
static void
|
||||
clipboard_clear_func (GtkClipboard *clipboard __attribute__((__unused__)),
|
||||
gpointer user_data_or_owner __attribute__((__unused__)))
|
||||
{
|
||||
}
|
||||
|
||||
#define CLIPBOARD_NAME "VPN_CLIPBOARD_FOO"
|
||||
|
||||
/*
|
||||
* vpn_get_clipboard - try and get the CLIPBOARD_NAME clipboard
|
||||
*
|
||||
* Returns TRUE if successfully retrieved and FALSE otherwise.
|
||||
*/
|
||||
gboolean
|
||||
vpn_get_clipboard (void)
|
||||
{
|
||||
static const GtkTargetEntry targets[] = { {CLIPBOARD_NAME, 0, 0} };
|
||||
gboolean retval = FALSE;
|
||||
GtkClipboard *clipboard;
|
||||
Atom atom;
|
||||
|
||||
atom = gdk_x11_get_xatom_by_name (CLIPBOARD_NAME);
|
||||
|
||||
XGrabServer (GDK_DISPLAY ());
|
||||
|
||||
if (XGetSelectionOwner (GDK_DISPLAY (), atom) != None)
|
||||
goto out;
|
||||
|
||||
clipboard = gtk_clipboard_get (gdk_atom_intern (CLIPBOARD_NAME, FALSE));
|
||||
|
||||
if (gtk_clipboard_set_with_data (clipboard, targets,
|
||||
G_N_ELEMENTS (targets),
|
||||
clipboard_get_func,
|
||||
clipboard_clear_func, NULL))
|
||||
retval = TRUE;
|
||||
|
||||
out:
|
||||
XUngrabServer (GDK_DISPLAY ());
|
||||
gdk_flush ();
|
||||
|
||||
return retval;
|
||||
}
|
||||
|
|
@ -1,6 +0,0 @@
|
|||
#ifndef _VPN_PROPERTIES_CLIPBOARD_H
|
||||
#define _VPN_PROPERTIES_CLIPBOARD_H
|
||||
|
||||
gboolean vpn_get_clipboard (void);
|
||||
|
||||
#endif /* _VPN_PROPERTIES_CLIPBOARD_H */
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,261 +0,0 @@
|
|||
<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
|
||||
<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
|
||||
|
||||
<glade-interface>
|
||||
<requires lib="gnome"/>
|
||||
|
||||
<widget class="GtkDialog" id="vpn-ui-properties">
|
||||
<property name="border_width">5</property>
|
||||
<property name="width_request">400</property>
|
||||
<property name="height_request">300</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="title" translatable="yes">VPN Connections</property>
|
||||
<property name="type">GTK_WINDOW_TOPLEVEL</property>
|
||||
<property name="window_position">GTK_WIN_POS_CENTER</property>
|
||||
<property name="modal">False</property>
|
||||
<property name="resizable">True</property>
|
||||
<property name="destroy_with_parent">False</property>
|
||||
<property name="decorated">True</property>
|
||||
<property name="skip_taskbar_hint">False</property>
|
||||
<property name="skip_pager_hint">False</property>
|
||||
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
|
||||
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
|
||||
<property name="has_separator">False</property>
|
||||
|
||||
<child internal-child="vbox">
|
||||
<widget class="GtkVBox" id="dialog-vbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child internal-child="action_area">
|
||||
<widget class="GtkHButtonBox" id="dialog-action_area1">
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_END</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="closebutton1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-close</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
<property name="response_id">-7</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
<property name="pack_type">GTK_PACK_END</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVBox" id="vbox25">
|
||||
<property name="border_width">5</property>
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">12</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label29">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">Manage Virtual Private Network Connections</property>
|
||||
<property name="use_underline">False</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0</property>
|
||||
<property name="yalign">0</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox70">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">6</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkScrolledWindow" id="scrolledwindow1">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||
<property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
|
||||
<property name="shadow_type">GTK_SHADOW_IN</property>
|
||||
<property name="window_placement">GTK_CORNER_TOP_LEFT</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkTreeView" id="vpnlist">
|
||||
<property name="visible">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="headers_visible">False</property>
|
||||
<property name="rules_hint">False</property>
|
||||
<property name="reorderable">False</property>
|
||||
<property name="enable_search">False</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkVButtonBox" id="vbuttonbox1">
|
||||
<property name="visible">True</property>
|
||||
<property name="layout_style">GTK_BUTTONBOX_START</property>
|
||||
<property name="spacing">6</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="add">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Add a new VPN connection</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-add</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="edit">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Edit the selected VPN connection</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-edit</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="export">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Export the selected VPN connection to a file</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkAlignment" id="alignment1">
|
||||
<property name="visible">True</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xscale">0</property>
|
||||
<property name="yscale">0</property>
|
||||
<property name="top_padding">0</property>
|
||||
<property name="bottom_padding">0</property>
|
||||
<property name="left_padding">0</property>
|
||||
<property name="right_padding">0</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkHBox" id="hbox71">
|
||||
<property name="visible">True</property>
|
||||
<property name="homogeneous">False</property>
|
||||
<property name="spacing">2</property>
|
||||
|
||||
<child>
|
||||
<widget class="GtkImage" id="image1">
|
||||
<property name="visible">True</property>
|
||||
<property name="stock">gtk-save</property>
|
||||
<property name="icon_size">4</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkLabel" id="label33">
|
||||
<property name="visible">True</property>
|
||||
<property name="label" translatable="yes">E_xport</property>
|
||||
<property name="use_underline">True</property>
|
||||
<property name="use_markup">False</property>
|
||||
<property name="justify">GTK_JUSTIFY_LEFT</property>
|
||||
<property name="wrap">False</property>
|
||||
<property name="selectable">False</property>
|
||||
<property name="xalign">0.5</property>
|
||||
<property name="yalign">0.5</property>
|
||||
<property name="xpad">0</property>
|
||||
<property name="ypad">0</property>
|
||||
<accessibility>
|
||||
<atkproperty name="AtkObject::accessible_description" translatable="yes">Export the VPN settings to a file</atkproperty>
|
||||
</accessibility>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">False</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
|
||||
<child>
|
||||
<widget class="GtkButton" id="delete">
|
||||
<property name="visible">True</property>
|
||||
<property name="tooltip" translatable="yes">Delete the selected VPN connection</property>
|
||||
<property name="can_default">True</property>
|
||||
<property name="can_focus">True</property>
|
||||
<property name="label">gtk-delete</property>
|
||||
<property name="use_stock">True</property>
|
||||
<property name="relief">GTK_RELIEF_NORMAL</property>
|
||||
<property name="focus_on_click">True</property>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">False</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
<packing>
|
||||
<property name="padding">0</property>
|
||||
<property name="expand">True</property>
|
||||
<property name="fill">True</property>
|
||||
</packing>
|
||||
</child>
|
||||
</widget>
|
||||
</child>
|
||||
</widget>
|
||||
|
||||
</glade-interface>
|
||||
|
|
@ -1,84 +0,0 @@
|
|||
/***************************************************************************
|
||||
* CVSID: $Id$
|
||||
*
|
||||
* nm-vpn-ui-interface.h : Public interface for VPN UI editing widgets
|
||||
*
|
||||
* Copyright (C) 2005 David Zeuthen, <davidz@redhat.com>
|
||||
*
|
||||
* ===
|
||||
* NOTE NOTE NOTE: All source for nm-vpn-properties is licensed to you
|
||||
* under your choice of the Academic Free License version 2.0, or the
|
||||
* GNU General Public License version 2.
|
||||
* ===
|
||||
*
|
||||
* Licensed under the Academic Free License version 2.0
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or modify
|
||||
* it under the terms of the GNU General Public License as published by
|
||||
* the Free Software Foundation; either version 2 of the License, or
|
||||
* (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write to the Free Software
|
||||
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
||||
*
|
||||
**************************************************************************/
|
||||
|
||||
#ifndef NM_VPN_UI_INTERFACE_H
|
||||
#define NM_VPN_UI_INTERFACE_H
|
||||
|
||||
#ifndef NM_VPN_API_SUBJECT_TO_CHANGE
|
||||
#error "Please define NM_VPN_API_SUBJECT_TO_CHANGE to acknowledge your understanding that NetworkManager hasn't reached 1.0 and is subject to protocol and API churn. See the README for a full explanation."
|
||||
#endif
|
||||
|
||||
#include <gtk/gtk.h>
|
||||
|
||||
struct _NetworkManagerVpnUI;
|
||||
typedef struct _NetworkManagerVpnUI NetworkManagerVpnUI;
|
||||
|
||||
typedef void (*NetworkManagerVpnUIDialogValidityCallback) (NetworkManagerVpnUI *self,
|
||||
gboolean is_valid,
|
||||
gpointer user_data);
|
||||
|
||||
|
||||
struct _NetworkManagerVpnUI {
|
||||
const char *(*get_display_name) (NetworkManagerVpnUI *self);
|
||||
|
||||
const char *(*get_service_name) (NetworkManagerVpnUI *self);
|
||||
|
||||
GtkWidget *(*get_widget) (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, const char *connection_name);
|
||||
|
||||
void (*set_validity_changed_callback) (NetworkManagerVpnUI *self,
|
||||
NetworkManagerVpnUIDialogValidityCallback cb,
|
||||
gpointer user_data);
|
||||
|
||||
gboolean (*is_valid) (NetworkManagerVpnUI *self);
|
||||
|
||||
/*
|
||||
* get_confirmation_details:
|
||||
* retval is allocated and must be freed
|
||||
*/
|
||||
void (*get_confirmation_details)(NetworkManagerVpnUI *self, gchar **retval);
|
||||
|
||||
char *(*get_connection_name) (NetworkManagerVpnUI *self);
|
||||
|
||||
GSList *(*get_properties) (NetworkManagerVpnUI *self);
|
||||
|
||||
GSList *(*get_routes) (NetworkManagerVpnUI *self);
|
||||
|
||||
gboolean (*can_export) (NetworkManagerVpnUI *self);
|
||||
|
||||
gboolean (*import_file) (NetworkManagerVpnUI *self, const char *path);
|
||||
|
||||
gboolean (*export) (NetworkManagerVpnUI *self, GSList *properties, GSList *routes, const char *connection_name);
|
||||
|
||||
gpointer data;
|
||||
};
|
||||
|
||||
#endif /* NM_VPN_UI_INTERFACE_H */
|
||||
|
||||
Loading…
Add table
Reference in a new issue