← Back to branch summary

~ubuntu-branches/ubuntu/hardy/evince/hardy-security

« back to all changes in this revision

Viewing changes to 01_launchpad.patch

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-05-25 10:30:19 UTC
  • Revision ID: james.westby@ubuntu.com-20070525103019-s505exm1d9sy9f0m
Tags: 0.9.0-1ubuntu1
* Sync with Debian
* debian/control.in:
  - Build-Depends on liblaunchpad-integration-dev
  - evince Depends on gs-esp-x
  - the maintainer is Ubuntu Desktop Team
* debian/evince.install.disabled:
  - install the documentation
* debian/patches/01_launchpad.patch:
  - launchpad integration
* debian/patches/02_autoconf.patch:
  - configure update

Show diffs side-by-side

added added

removed removed

Lines of Context:
01_launchpad.patch
1
 
diff -Nur evince-0.8.1/configure.ac evince-0.8.1.new/configure.ac
2
 
--- evince-0.8.1/configure.ac   2007-04-09 22:35:24.000000000 +0200
3
 
+++ evince-0.8.1.new/configure.ac       2007-04-09 23:59:24.000000000 +0200
4
 
@@ -57,7 +57,7 @@
5
 
 PKG_CHECK_MODULES(LIB, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libxml-2.0 >= $LIBXML_REQUIRED)
6
 
 PKG_CHECK_MODULES(BACKEND, gtk+-2.0 >= $GTK_REQUIRED gnome-vfs-2.0 libgnome-2.0 >= $LIBGNOME_REQUIRED)
7
 
 PKG_CHECK_MODULES(FRONTEND_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED libglade-2.0 gnome-vfs-2.0)
8
 
-PKG_CHECK_MODULES(SHELL_CORE, gtk+-2.0 >= $GTK_REQUIRED libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
9
 
+PKG_CHECK_MODULES(SHELL_CORE, gtk+-2.0 >= $GTK_REQUIRED launchpad-integration libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED gnome-icon-theme >= $GNOME_ICON_THEME_REQUIRED gnome-vfs-2.0 libglade-2.0 gconf-2.0 gnome-keyring-1 >= $KEYRING_REQUIRED)
10
 
 
11
 
 BACKEND_CFLAGS="$BACKEND_CFLAGS -DGDK_MULTIHEAD_SAFE -DGTK_MULTIHEAD_SAFE"
12
 
 AC_SUBST(BACKEND_CFLAGS)
13
 
diff -Nur evince-0.8.1/data/evince-ui.xml evince-0.8.1.new/data/evince-ui.xml
14
 
--- evince-0.8.1/data/evince-ui.xml     2007-04-09 21:40:07.000000000 +0200
15
 
+++ evince-0.8.1.new/data/evince-ui.xml 2007-04-09 23:59:00.000000000 +0200
16
 
@@ -57,6 +57,9 @@
17
 
 
18
 
     <menu name="HelpMenu" action="Help">
19
 
       <menuitem name="HelpContentsMenu" action="HelpContents"/>
20
 
+      <separator/>
21
 
+      <placeholder name="LaunchpadItems" />
22
 
+      <separator/>
23
 
       <menuitem name="HelpAboutMenu" action="HelpAbout"/>
24
 
     </menu>
25
 
   </menubar>
26
 
diff -Nur evince-0.8.1/shell/ev-window.c evince-0.8.1.new/shell/ev-window.c
27
 
--- evince-0.8.1/shell/ev-window.c      2007-04-09 22:16:05.000000000 +0200
28
 
+++ evince-0.8.1.new/shell/ev-window.c  2007-04-09 23:59:00.000000000 +0200
29
 
@@ -92,6 +92,8 @@
30
 
 #include <libgnomevfs/gnome-vfs-async-ops.h>
31
 
 #include <gconf/gconf-client.h>
32
 
 
33
 
+#include <launchpad-integration.h>
34
 
+
35
 
 #include <string.h>
36
 
 
37
 
 char *xdg_user_dir_lookup (char *type);
38
 
@@ -4915,6 +4917,9 @@
39
 
                                  ev_window);
40
 
 #endif /* HAVE_GTK_RECENT */
41
 
        
42
 
+       launchpad_integration_add_ui (ev_window->priv->ui_manager,
43
 
+                                     "/MainMenu/HelpMenu/LaunchpadItems");
44
 
+       
45
 
        ev_window->priv->menubar =
46
 
                 gtk_ui_manager_get_widget (ev_window->priv->ui_manager,
47
 
                                            "/MainMenu");