diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 28 | ||||
| -rw-r--r-- | appdata/iodine.png | bin | 0 -> 31950 bytes | |||
| -rw-r--r-- | appdata/network-manager-iodine.appdata.xml.in | 39 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | network-manager-iodine.doap | 6 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | properties/nm-iodine-dialog.ui | 57 |
8 files changed, 97 insertions, 43 deletions
@@ -21,12 +21,14 @@ stamp-* TAGS autom4te.cache intltool-* +po/NetworkManager-iodine.pot po/*.gmo po/.intltool-merge-cache m4/gtk-doc.m4 m4/intltool.m4 m4/libtool.m4 m4/lt*.m4 +network-manager-iodine.appdata.xml nm-iodine-service.name src/nm-iodine-service diff --git a/Makefile.am b/Makefile.am index 24174e0..35a5565 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,13 +17,28 @@ nmvpnservicedir = $(NM_VPN_SERVICE_DIR) nmvpnservice_DATA = nm-iodine-service.name if WITH_LIBNM_GLIB -nmvpnoldservicedir = $(sysconfdir)/NetworkManager/VPN -nmvpnoldservice_DATA = nm-iodine-service.name +# Install a file with full path to plugins for an old gnome-shell +# https://bugzilla.gnome.org/show_bug.cgi?id=693590 +install-data-hook: + mkdir -p $(DESTDIR)$(sysconfdir)/NetworkManager/VPN + sed -e "1s|^|# This file is obsoleted by a file in $(NM_VPN_SERVICE_DIR)\n\n|" \ + -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ + -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \ + <$(srcdir)/nm-iodine-service.name.in \ + >$(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name + +uninstall-hook: + rm -f $(DESTDIR)$(sysconfdir)/NetworkManager/VPN/nm-iodine-service.name endif +appdatadir = $(datadir)/appdata +appdata_DATA = $(appdata_in_files:.xml.in=.xml) +appdata_in_files = appdata/network-manager-iodine.appdata.xml.in +@INTLTOOL_XML_RULE@ + nm-iodine-service.name: $(srcdir)/nm-iodine-service.name.in sed -e 's|[@]LIBEXECDIR[@]|$(libexecdir)|g' \ - -e 's|[@]PLUGINDIR[@]|$(libdir)/NetworkManager|g' \ + -e 's|[@]PLUGINDIR[@]/|@NM_PLUGIN_DIR@|g' \ $< >$@ DISTCHECK_CONFIGURE_FLAGS = --enable-more-warnings=yes @@ -32,11 +47,16 @@ EXTRA_DIST = nm-iodine-service.name.in \ $(dbusservice_DATA) \ $(desktop_in_files) \ $(icon_DATA) \ + $(appdata_in_files) \ + $(appdata_DATA) \ intltool-extract.in \ intltool-merge.in \ intltool-update.in -CLEANFILES = $(nmvpnservice_DATA) $(desktop_DATA) *~ +CLEANFILES = $(nmvpnservice_DATA) \ + $(desktop_DATA) \ + $(appdata_DATA) + DISTCLEANFILES = intltool-extract intltool-merge intltool-update ACLOCAL_AMFLAGS = -I m4 diff --git a/appdata/iodine.png b/appdata/iodine.png Binary files differnew file mode 100644 index 0000000..ee82651 --- /dev/null +++ b/appdata/iodine.png diff --git a/appdata/network-manager-iodine.appdata.xml.in b/appdata/network-manager-iodine.appdata.xml.in new file mode 100644 index 0000000..4286cc9 --- /dev/null +++ b/appdata/network-manager-iodine.appdata.xml.in @@ -0,0 +1,39 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- Copyright Lubomir Rintel 2016 --> +<component type="addon"> + <id>network-manager-iodine</id> + <project_license>GPL-2.0+</project_license> + <metadata_license>CC0-1.0</metadata_license> + <extends>nm-connection-editor.desktop</extends> + <extends>gnome-control-center.desktop</extends> + <_name>Iodine DNS Tunnel</_name> + <_summary>Client for Iodine DNS Tunnel</_summary> + + <keywords> + <keyword>network</keyword> + <keyword>manager</keyword> + <keyword>NetworkManager</keyword> + <keyword>connection</keyword> + <keyword>VPN</keyword> + <keyword>Iodine</keyword> + <keyword>DNS</keyword> + </keywords> + + <description> + <_p>Support for tunnelling IP traffic via DNS using Iodine.</_p> + <_p>This is useful to get useful connectivity in cases where Internet + access is severely filtered.</_p> + </description> + + <screenshots> + <screenshot type="default"> + <image width="800" height="514">https://git.gnome.org/browse/network-manager-iodine/plain/appdata/iodine.png</image> + </screenshot> + </screenshots> + + <url type="homepage">https://honk.sigxcpu.org/piki/projects/network-manager-iodine/</url> + <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=NetworkManager</url> + <update_contact>agx@sigxcpu.org</update_contact> + <translation type="gettext">NetworkManager-iodine</translation> + <_developer_name>Guido Günther</_developer_name> +</component> diff --git a/configure.ac b/configure.ac index 8596102..4109715 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ(2.52) -AC_INIT(NetworkManager-iodine, 1.1.0, agx@sigxcpu.org, NetworkManager-iodine) +AC_INIT(NetworkManager-iodine, 1.2.0, agx@sigxcpu.org, NetworkManager-iodine) AM_INIT_AUTOMAKE([subdir-objects no-dist-gzip dist-xz]) AM_MAINTAINER_MODE @@ -48,6 +48,8 @@ AM_CONDITIONAL(WITH_AUTHDLG, test x"$with_authdlg" != xno) AC_ARG_WITH(libnm-glib, AS_HELP_STRING([--without-libnm-glib], [Build NetworkManager-iodine without libnm-glib comatibility])) AM_CONDITIONAL(WITH_LIBNM_GLIB, test x"$with_libnm_glib" != xno) +AC_ARG_ENABLE(absolute-paths, AS_HELP_STRING([--enable-absolute-paths], [Use absolute paths to in .name files. Useful for development. (default is no)])) + GETTEXT_PACKAGE=NetworkManager-iodine AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package]) @@ -81,6 +83,9 @@ LIBNM_CFLAGS="$LIBNM_CFLAGS -DNM_VERSION_MAX_ALLOWED=NM_VERSION_1_2" NM_VPN_SERVICE_DIR=`$PKG_CONFIG pkg-config --define-variable prefix='\${prefix}' --variable vpnservicedir libnm` AC_SUBST(NM_VPN_SERVICE_DIR) +test x"$enable_absolute_paths" = x"yes" && NM_PLUGIN_DIR='$(libdir)/NetworkManager/' +AC_SUBST(NM_PLUGIN_DIR) + NM_COMPILER_WARNINGS AC_CONFIG_FILES([ diff --git a/network-manager-iodine.doap b/network-manager-iodine.doap index 19be840..61e372e 100644 --- a/network-manager-iodine.doap +++ b/network-manager-iodine.doap @@ -7,10 +7,12 @@ <name xml:lang="en">network-manager-iodine</name> <shortdesc xml:lang="en">Iodine support for NetworkManager</shortdesc> + <description>Provides connections via DNS tunnels using NetworkManager and Iodine.</description> <homepage rdf:resource="http://honk.sigxcpu.org/piki/projects/network-manager-iodine/" /> - <category rdf:resource="http://api.gnome.org/doap-extensions#development" /> - <download-page rdf:resource="http://honk.sigxcpu.org/projects/network-manager-iodine/tarballs/" /> + <category rdf:resource="http://api.gnome.org/doap-extensions#infrastructure" /> + <programming-language>C</programming-language> + <download-page rdf:resource="https://download.gnome.org/sources/NetworkManager-iodine/" /> <maintainer> <foaf:Person> diff --git a/po/POTFILES.in b/po/POTFILES.in index 9b5980e..7dd1feb 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,5 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. +appdata/network-manager-iodine.appdata.xml.in auth-dialog/main.c properties/nm-iodine.c [type: gettext/glade]properties/nm-iodine-dialog.ui diff --git a/properties/nm-iodine-dialog.ui b/properties/nm-iodine-dialog.ui index 1b7d772..d1ef9ee 100644 --- a/properties/nm-iodine-dialog.ui +++ b/properties/nm-iodine-dialog.ui @@ -1,6 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> +<!-- Generated with glade 3.20.0 --> <interface> - <!-- interface-requires gtk+ 3.0 --> + <requires lib="gtk+" version="3.0"/> <object class="GtkListStore" id="pass_type_model"> <columns> <!-- column-name gchararray --> @@ -29,10 +30,10 @@ <object class="GtkLabel" id="label22"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">General</property> + <property name="xalign">0</property> <attributes> - <attribute name="weight" value="bold"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -47,12 +48,11 @@ <property name="can_focus">False</property> <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table2"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="n_columns">2</property> - <property name="column_spacing">6</property> <property name="row_spacing">6</property> + <property name="column_spacing">6</property> <child> <object class="GtkAlignment" id="alignment2"> <property name="visible">True</property> @@ -63,30 +63,32 @@ <object class="GtkEntry" id="topdomain_entry"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_focus">True</property> <property name="invisible_char">•</property> </object> </child> </object> <packing> <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> + <property name="top_attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="label23"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Toplevel Domain:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">topdomain_entry</property> + <property name="xalign">0</property> </object> <packing> - <property name="y_options"></property> + <property name="left_attach">0</property> + <property name="top_attach">0</property> </packing> </child> + <child> + <placeholder/> + </child> </object> </child> </object> @@ -112,10 +114,10 @@ <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">Optional</property> + <property name="xalign">0</property> <attributes> - <attribute name="weight" value="bold"/> + <attribute name="weight" value="bold"/> </attributes> </object> <packing> @@ -139,32 +141,28 @@ <object class="GtkLabel" id="label28"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Nameserver:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">nameserver_entry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Password:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">password_entry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -173,29 +171,24 @@ <property name="can_focus">True</property> <property name="visibility">False</property> <property name="invisible_char">●</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> <object class="GtkLabel" id="label29"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="xalign">0</property> <property name="label" translatable="yes">_Fragment Size:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">fragsize_entry</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -203,13 +196,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">3</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -217,13 +207,10 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="invisible_char">•</property> - <property name="invisible_char_set">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">0</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -233,15 +220,12 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> - <property name="use_action_appearance">False</property> <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> <packing> <property name="left_attach">1</property> <property name="top_attach">2</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -259,8 +243,6 @@ <packing> <property name="left_attach">2</property> <property name="top_attach">1</property> - <property name="width">1</property> - <property name="height">1</property> </packing> </child> <child> @@ -272,6 +254,9 @@ <child> <placeholder/> </child> + <child> + <placeholder/> + </child> </object> </child> </object> |
