aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-07-23 07:21:31 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2020-07-23 07:21:31 +0200
commitf8f87bdc7d9991edb984579dd230cc244a3e97eb (patch)
tree0284c81f777931564850fcd3920e17aa6a409040
parent9e2cc8f1a7684f388758ddc34fd352b480b24039 (diff)
parent9384761ae2a957c1673ef682d9fa1a205eb9ec4c (diff)
downloadayatana-ido-f8f87bdc7d9991edb984579dd230cc244a3e97eb.tar.gz
ayatana-ido-f8f87bdc7d9991edb984579dd230cc244a3e97eb.tar.bz2
ayatana-ido-f8f87bdc7d9991edb984579dd230cc244a3e97eb.zip
Merge branch 'tari01-master'
Attributes GH PR #4: https://github.com/AyatanaIndicators/ayatana-ido/pull/4
-rw-r--r--debian/copyright1
-rw-r--r--src/Makefile.am1
-rw-r--r--src/ayatana-private.h32
-rw-r--r--src/idomenuitemfactory.c3
4 files changed, 1 insertions, 36 deletions
diff --git a/debian/copyright b/debian/copyright
index d714da6..29dd1b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,6 @@ Source: https://github.com/AyatanaIndicators/ayatana-ido
Files: src/ayatanamenuitemfactory.c
src/ayatanamenuitemfactory.h
- src/ayatana-private.h
src/idoactionhelper.c
src/idoactionhelper.h
src/idoalarmmenuitem.c
diff --git a/src/Makefile.am b/src/Makefile.am
index 864ab90..b9cf3dd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -11,7 +11,6 @@ stamp_files = \
sources_h = \
ayatanamenuitemfactory.h \
- ayatana-private.h \
idoalarmmenuitem.h \
idocalendarmenuitem.h \
idoentrymenuitem.h \
diff --git a/src/ayatana-private.h b/src/ayatana-private.h
deleted file mode 100644
index 3cb7e65..0000000
--- a/src/ayatana-private.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
-* Copyright 2013 Canonical Ltd.
-*
-* This program is free software: you can redistribute it and/or modify it
-* under the terms of the GNU General Public License version 3, as published
-* by the Free Software Foundation.
-*
-* This program is distributed in the hope that it will be useful, but
-* WITHOUT ANY WARRANTY; without even the implied warranties of
-* MERCHANTABILITY, SATISFACTORY QUALITY, 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, see <http://www.gnu.org/licenses/>.
-*
-* Authors:
-* Lars Uebernickel <lars.uebernickel@canonical.com>
-*/
-
-/*
- * Warning: this file is not part of gtk+, but an Ubuntu-specific extension.
- * The API provided here is meant to be used only from Unity.
- *
- * Applications should not use this.
- */
-
-#ifndef __AYATANA_PRIVATE_H__
-#define __AYATANA_PRIVATE_H__
-
-#include "ayatanamenuitemfactory.h"
-
-#endif
diff --git a/src/idomenuitemfactory.c b/src/idomenuitemfactory.c
index 8d2334b..a248b42 100644
--- a/src/idomenuitemfactory.c
+++ b/src/idomenuitemfactory.c
@@ -18,8 +18,7 @@
*/
#include <gtk/gtk.h>
-#include "ayatana-private.h"
-
+#include "ayatanamenuitemfactory.h"
#include "idoalarmmenuitem.h"
#include "idoappointmentmenuitem.h"
#include "idobasicmenuitem.h"