GNOME.org
 

[gnome-panel/wip/gnome-3.10+: 31/31] build: fix 'make distcheck'

commit 77bbf69b54f04b0c9e8c2d79676c33721aa7114e
Author: Alberts Muktupāvels <alberts muktupavels gmail com>
Date:   Sun Jul 13 01:16:39 2014 +0300

    build: fix 'make distcheck'

 Makefile.am                                        |    3 +-
 .../panel-applet/panel-applet-sections.txt         |    4 +-
 doc/reference/panel-applet/tmpl/applet.sgml        |   57 ++++---------------
 gnome-panel/Makefile.am                            |    1 +
 libpanel-applet/Makefile.am                        |    4 +-
 libpanel-applet/panel-applet.c                     |    3 +
 po/POTFILES.in                                     |    7 ++-
 po/POTFILES.skip                                   |    5 --
 8 files changed, 25 insertions(+), 59 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 23e1543..d619218 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,8 +15,7 @@ DISTCHECK_CONFIGURE_FLAGS = --enable-gtk-doc --enable-introspection --disable-sc
 EXTRA_DIST = \
        COPYING-DOCS            \
        HACKING                 \
-       MAINTAINERS             \
-       ChangeLog.pre-git
+       MAINTAINERS
 
 MAINTAINERCLEANFILES = \
        $(srcdir)/INSTALL \
diff --git a/doc/reference/panel-applet/panel-applet-sections.txt 
b/doc/reference/panel-applet/panel-applet-sections.txt
index 409b547..daa21d5 100644
--- a/doc/reference/panel-applet/panel-applet-sections.txt
+++ b/doc/reference/panel-applet/panel-applet-sections.txt
@@ -7,7 +7,6 @@ PanelApplet
 PanelAppletOrient
 PanelAppletFlags
 panel_applet_get_orient
-panel_applet_get_size
 panel_applet_set_size_hints
 panel_applet_get_background
 panel_applet_set_background_widget
@@ -15,11 +14,10 @@ panel_applet_get_flags
 panel_applet_set_flags
 panel_applet_get_locked_down
 panel_applet_settings_new
-panel_applet_add_preferences
-panel_applet_get_preferences_key
 panel_applet_request_focus
 panel_applet_setup_menu
 panel_applet_setup_menu_from_file
+panel_applet_setup_menu_from_resource
 <SUBSECTION Standard>
 PANEL_APPLET
 PANEL_IS_APPLET
diff --git a/doc/reference/panel-applet/tmpl/applet.sgml b/doc/reference/panel-applet/tmpl/applet.sgml
index 7f635f2..ee171e8 100644
--- a/doc/reference/panel-applet/tmpl/applet.sgml
+++ b/doc/reference/panel-applet/tmpl/applet.sgml
@@ -42,14 +42,6 @@ Panel Applet
 @panelapplet: the object which received the signal.
 @arg1: 
 
-<!-- ##### SIGNAL PanelApplet::change-size ##### -->
-<para>
-
-</para>
-
- panelapplet: the object which received the signal.
- arg1: 
-
 <!-- ##### SIGNAL PanelApplet::move-focus-out-of-applet ##### -->
 <para>
 
@@ -93,21 +85,11 @@ Panel Applet
 
 </para>
 
-<!-- ##### ARG PanelApplet:prefs-key ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG PanelApplet:settings-path ##### -->
 <para>
 
 </para>
 
-<!-- ##### ARG PanelApplet:size ##### -->
-<para>
-
-</para>
-
 <!-- ##### ARG PanelApplet:size-hints ##### -->
 <para>
 
@@ -142,15 +124,6 @@ Panel Applet
 @Returns: 
 
 
-<!-- ##### FUNCTION panel_applet_get_size ##### -->
-<para>
-
-</para>
-
- applet: 
- Returns: 
-
-
 <!-- ##### FUNCTION panel_applet_set_size_hints ##### -->
 <para>
 
@@ -217,51 +190,45 @@ Panel Applet
 @Returns: 
 
 
-<!-- ##### FUNCTION panel_applet_add_preferences ##### -->
-<para>
-
-</para>
-
- applet: 
- schema_dir: 
- error: 
-
-
-<!-- ##### FUNCTION panel_applet_get_preferences_key ##### -->
+<!-- ##### FUNCTION panel_applet_request_focus ##### -->
 <para>
 
 </para>
 
 @applet: 
- Returns: 
+ timestamp: 
 
 
-<!-- ##### FUNCTION panel_applet_request_focus ##### -->
+<!-- ##### FUNCTION panel_applet_setup_menu ##### -->
 <para>
 
 </para>
 
 @applet: 
- timestamp: 
+ xml: 
+ action_group: 
+ translation_domain: 
 
 
-<!-- ##### FUNCTION panel_applet_setup_menu ##### -->
+<!-- ##### FUNCTION panel_applet_setup_menu_from_file ##### -->
 <para>
 
 </para>
 
 @applet: 
- xml: 
+ filename: 
 @action_group: 
+ translation_domain: 
 
 
-<!-- ##### FUNCTION panel_applet_setup_menu_from_file ##### -->
+<!-- ##### FUNCTION panel_applet_setup_menu_from_resource ##### -->
 <para>
 
 </para>
 
 @applet: 
- filename: 
+ resource_path: 
 @action_group: 
+ translation_domain: 
 
 
diff --git a/gnome-panel/Makefile.am b/gnome-panel/Makefile.am
index b8c7c7d..45c15ef 100644
--- a/gnome-panel/Makefile.am
+++ b/gnome-panel/Makefile.am
@@ -264,6 +264,7 @@ desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 EXTRA_DIST =                                   \
        $(ui_FILES)                             \
        panel.gresource.xml                     \
+       gnome-panel.css \
        $(uitest_FILES)                         \
        panel-test-applets.gresource.xml        \
        nothing.cP                              \
diff --git a/libpanel-applet/Makefile.am b/libpanel-applet/Makefile.am
index 2059235..61548a5 100644
--- a/libpanel-applet/Makefile.am
+++ b/libpanel-applet/Makefile.am
@@ -92,8 +92,8 @@ noinst_DATA     = $(applet_in_files:.panel-applet.in=.panel-applet)
 EXTRA_DIST =                                           \
        org.gnome.panel.TestApplet.panel-applet.in      \
        panel-applet-marshal.list                       \
-       libpanelapplet.pc.in                    \
-       libpanelapplet-uninstalled.pc.in
+       libpanel-applet.pc.in                   \
+       libpanel-applet-uninstalled.pc.in
 
 CLEANFILES = $(BUILT_SOURCES) $(noinst_DATA)
 
diff --git a/libpanel-applet/panel-applet.c b/libpanel-applet/panel-applet.c
index 0fa62d9..d2c8a63 100644
--- a/libpanel-applet/panel-applet.c
+++ b/libpanel-applet/panel-applet.c
@@ -692,6 +692,7 @@ panel_applet_menu_cmd_move (GSimpleAction *action,
  * @applet: a #PanelApplet.
  * @xml: a menu XML string.
  * @action_group: a #GtkActionGroup.
+ * @translation_domain: gettext translation domain
  *
  * Sets up the context menu of @applet. @xml is a #GtkUIManager UI definition,
  * describing how to display the menu items. @action_group contains the
@@ -734,6 +735,7 @@ panel_applet_setup_menu (PanelApplet    *applet,
  * @applet: a #PanelApplet.
  * @filename: path to a menu XML file.
  * @action_group: a #GtkActionGroup.
+ * @translation_domain: gettext translation domain
  *
  * Sets up the context menu of @applet. @filename is the path to a menu XML
  * file, containing a #GtkUIManager UI definition that describes how to display
@@ -767,6 +769,7 @@ panel_applet_setup_menu_from_file (PanelApplet    *applet,
  * @applet: a #PanelApplet.
  * @resource_path: a resource path
  * @action_group: a #GtkActionGroup.
+ * @translation_domain: gettext translation domain
  *
  * Sets up the context menu of @applet. @filename is a resource path to a menu
  * XML file, containing a #GtkUIManager UI definition that describes how to
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 2a32822..1d090a9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -6,10 +6,12 @@ applets/clock/calendar-window.c
 applets/clock/clock.c
 applets/clock/clock-location.c
 applets/clock/clock-location-tile.c
+[type: gettext/glade]applets/clock/clock-menu.xml
 [type: gettext/glade]applets/clock/clock.ui
 applets/clock/clock-utils.c
 [type: gettext/ini]applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
 applets/fish/fish.c
+[type: gettext/glade]applets/fish/fish-menu.xml
 [type: gettext/glade]applets/fish/fish.ui
 [type: gettext/ini]applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
 applets/notification_area/main.c
@@ -18,13 +20,13 @@ applets/notification_area/na-tray-manager.c
 [type: gettext/ini]applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
 applets/wncklet/showdesktop.c
 applets/wncklet/window-list.c
+[type: gettext/glade]applets/wncklet/window-list-menu.xml
 [type: gettext/glade]applets/wncklet/window-list.ui
 applets/wncklet/window-menu.c
 applets/wncklet/wncklet.c
 applets/wncklet/workspace-switcher.c
+[type: gettext/glade]applets/wncklet/workspace-switcher-menu.xml
 [type: gettext/glade]applets/wncklet/workspace-switcher.ui
-data/gnome-flashback.desktop.in.in
-data/gnome-flashback.session.desktop.in
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in.in
 data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in.in
@@ -61,6 +63,7 @@ gnome-panel/panel-layout.c
 gnome-panel/panel-menu-bar.c
 gnome-panel/panel-menu-button.c
 gnome-panel/panel-menu-items.c
+gnome-panel/panel-image-menu-item.c
 gnome-panel/panel-properties-dialog.c
 [type: gettext/glade]gnome-panel/panel-properties-dialog.ui
 gnome-panel/panel-recent.c
diff --git a/po/POTFILES.skip b/po/POTFILES.skip
index 5cd9f64..2909b39 100644
--- a/po/POTFILES.skip
+++ b/po/POTFILES.skip
@@ -1,10 +1,5 @@
 # List of source files that should *not* be translated.
 # Please keep this file sorted alphabetically.
-applets/clock/GNOME_ClockApplet_Factory.server.in
-applets/fish/GNOME_FishApplet_Factory.server.in
-applets/notification_area/GNOME_NotificationAreaApplet.server.in
-applets/wncklet/GNOME_Wncklet_Factory.server.in
-data/gnome-flashback.desktop.in
 data/org.gnome.gnome-panel.applet.clock.gschema.xml.in
 data/org.gnome.gnome-panel.applet.fish.gschema.xml.in
 data/org.gnome.gnome-panel.applet.window-list.gschema.xml.in
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]