← Back to branch summary

~ubuntu-branches/ubuntu/jaunty/xvidcap/jaunty-proposed

« back to all changes in this revision

Viewing changes to src/eggtrayicon.h

  • Committer: Bazaar Package Importer
  • Author(s): Lionel Le Folgoc, Andrew Starr-Bochicchio, Lionel Le Folgoc
  • Date: 2008-12-26 00:10:06 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20081226001006-2040ls9680bd1blt
Tags: 1.1.7-0.2ubuntu1
https://launchpad.net/bugs/298547
https://launchpad.net/bugs/311412
[ Andrew Starr-Bochicchio ]
* Merge from debian-multimedia (LP: #298547), Ubuntu Changes:
 - For ffmpeg-related build-deps, fix versionized dependencies
   as the ubuntu versioning is different than debian-multimedia's.

[ Lionel Le Folgoc ]
* LP: #311412 is fixed since the 1.1.7~rc1-0.1 revision.
* debian/patches/03_ffmpeg.diff: updated to fix FTBFS due to libswscale API
  change (cherry-pick from Gentoo #234383).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/eggtrayicon.h
18
18
 * Boston, MA 02111-1307, USA.
19
19
 */
20
20
 
21
 
#ifndef __EGG_TRAY_ICON_H__
22
 
#define __EGG_TRAY_ICON_H__
 
21
#ifndef _xvc_EGG_TRAY_ICON_H__
 
22
#define _xvc_EGG_TRAY_ICON_H__
23
23
 
24
24
#include <gtk/gtkplug.h>
25
25
#ifdef GDK_WINDOWING_X11
33
33
#define EGG_IS_TRAY_ICON(obj)           (G_TYPE_CHECK_INSTANCE_TYPE ((obj), EGG_TYPE_TRAY_ICON))
34
34
#define EGG_IS_TRAY_ICON_CLASS(klass)   (G_TYPE_CHECK_CLASS_TYPE ((klass), EGG_TYPE_TRAY_ICON))
35
35
#define EGG_TRAY_ICON_GET_CLASS(obj)    (G_TYPE_INSTANCE_GET_CLASS ((obj), EGG_TYPE_TRAY_ICON, EggTrayIconClass))
36
 
typedef struct _EggTrayIcon EggTrayIcon;
37
 
typedef struct _EggTrayIconClass EggTrayIconClass;
 
36
typedef struct _eggTrayIcon EggTrayIcon;
 
37
typedef struct _eggTrayIconClass EggTrayIconClass;
38
38
 
39
 
struct _EggTrayIcon
 
39
struct _eggTrayIcon
40
40
{
41
41
    GtkPlug parent_instance;
42
42
 
52
52
    GtkOrientation orientation;
53
53
};
54
54
 
55
 
struct _EggTrayIconClass
 
55
struct _eggTrayIconClass
56
56
{
57
57
    GtkPlugClass parent_class;
58
58
};
71
71
GtkOrientation egg_tray_icon_get_orientation (EggTrayIcon * icon);
72
72
 
73
73
G_END_DECLS
74
 
#endif     /* __EGG_TRAY_ICON_H__ */
 
74
#endif     /* _xvc_EGG_TRAY_ICON_H__ */