~ubuntu-branches/ubuntu/precise/epiphany-browser/precise-updates

« back to all changes in this revision

Viewing changes to lib/egg/eggsmclient-xsmp.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-07-22 11:25:31 UTC
  • mfrom: (1.6.2 upstream) (98.2.2 sid)
  • Revision ID: james.westby@ubuntu.com-20110722112531-0np34twsgorr803p
Tags: 3.0.4-1ubuntu1
* Resynchronize on Debian, remaining diffs:
* debian/branding.conf.in: set the branding to Ubuntu.
* debian/epiphany-browser-data.gconf-defaults:
  - set startpage and search to Ubuntu
* debian/patches/80_ubuntu_search_url.patch: use Ubuntu search
* debian/patches/81_ubuntu_force_update_bookmarks_menu.patch:
  - update the bookmarks menu every time the internal structure
    is changed (needed for the indicator application menu to work correctly).

Show diffs side-by-side

added added

removed removed

Lines of Context:
35
35
#include <unistd.h>
36
36
#include <X11/SM/SMlib.h>
37
37
 
 
38
#include <gdk/gdkx.h>
 
39
 
38
40
#define EGG_TYPE_SM_CLIENT_XSMP            (egg_sm_client_xsmp_get_type ())
39
41
#define EGG_SM_CLIENT_XSMP(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMP))
40
42
#define EGG_SM_CLIENT_XSMP_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), EGG_TYPE_SM_CLIENT_XSMP, EggSMClientXSMPClass))