libindicator

Merge lp:~indicator-applet-developers/libindicator/ubuntu into lp:~ubuntu-desktop/libindicator/ubuntu

  1. ubuntu
  2. Merge into ubuntu
Proposed by Ted Gould
Status: Merged
Merged at revision: not available
Proposed branch: lp:~indicator-applet-developers/libindicator/ubuntu
Merge into: lp:~ubuntu-desktop/libindicator/ubuntu
Diff against target: 328 lines (+140/-17)
10 files modified
AUTHORS (+1/-0)
configure.ac (+5/-3)
debian/changelog (+8/-0)
debian/rules (+1/-1)
libindicator/Makefile.am (+27/-3)
libindicator/indicator-object-enum-types.c.template (+30/-0)
libindicator/indicator-object-enum-types.h.template (+27/-0)
libindicator/indicator-object-marshal.list (+1/-0)
libindicator/indicator-object.c (+24/-3)
libindicator/indicator-object.h (+16/-7)
To merge this branch: bzr merge lp:~indicator-applet-developers/libindicator/ubuntu
Reviewer Review Type Date Requested Status
Ken VanDine Pending
Review via email: mp+21653@code.launchpad.net

Description of the change

0.3.6

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'AUTHORS'
--- AUTHORS 2009-02-11 21:59:42 +0000
+++ AUTHORS 2010-03-18 16:33:19 +0000
@@ -1,1 +1,2 @@
1Ted Gould <ted@canonical.com>1Ted Gould <ted@canonical.com>
2Cody Russell <crussell@canonical.com>
2\ No newline at end of file3\ No newline at end of file
34
=== modified file 'configure.ac'
--- configure.ac 2010-03-11 20:22:51 +0000
+++ configure.ac 2010-03-18 16:33:19 +0000
@@ -1,10 +1,10 @@
11
2AC_INIT(libindicator, 0.3.5, ted@canonical.com)2AC_INIT(libindicator, 0.3.6, ted@canonical.com)
33
4AC_PREREQ(2.53)4AC_PREREQ(2.53)
55
6AM_CONFIG_HEADER(config.h)6AM_CONFIG_HEADER(config.h)
7AM_INIT_AUTOMAKE(libindicator, 0.3.5)7AM_INIT_AUTOMAKE(libindicator, 0.3.6)
88
9AM_MAINTAINER_MODE9AM_MAINTAINER_MODE
10m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])10m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES])
@@ -15,6 +15,8 @@
15AC_STDC_HEADERS15AC_STDC_HEADERS
16AC_PROG_LIBTOOL16AC_PROG_LIBTOOL
1717
18AC_PATH_PROG([GLIB_MKENUMS], [glib-mkenums])
19
18AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])20AC_PATH_PROG([GLIB_GENMARSHAL], [glib-genmarshal])
1921
20AC_SUBST(VERSION)22AC_SUBST(VERSION)
@@ -66,7 +68,7 @@
66 REAL_PREFIX=$prefix68 REAL_PREFIX=$prefix
67fi69fi
6870
69# Have to go $sysconfdir->$prefix/etc->/usr/local/etc 71# Have to go $sysconfdir->$prefix/etc->/usr/local/etc
70# if you actually know how to code shell then fix this :-)72# if you actually know how to code shell then fix this :-)
71SYSCONFDIR_TMP="$sysconfdir"73SYSCONFDIR_TMP="$sysconfdir"
72old_prefix=$prefix74old_prefix=$prefix
7375
=== modified file 'debian/changelog'
--- debian/changelog 2010-03-11 21:52:27 +0000
+++ debian/changelog 2010-03-18 16:33:19 +0000
@@ -1,3 +1,11 @@
1libindicator (0.3.6-0ubuntu1~ppa1) lucid; urgency=low
2
3 * Upstream release 0.3.6
4 * Adding in scroll signals for the indicators
5 * debian/rules: Updating shlibs
6
7 -- Ted Gould <ted@ubuntu.com> Thu, 18 Mar 2010 11:10:20 -0500
8
1libindicator (0.3.5-0ubuntu1) lucid; urgency=low9libindicator (0.3.5-0ubuntu1) lucid; urgency=low
210
3 * Upstream release 0.3.511 * Upstream release 0.3.5
412
=== modified file 'debian/rules'
--- debian/rules 2010-03-11 20:26:58 +0000
+++ debian/rules 2010-03-18 16:33:19 +0000
@@ -5,4 +5,4 @@
55
6LDFLAGS += -Wl,-z,defs -Wl,--as-needed6LDFLAGS += -Wl,-z,defs -Wl,--as-needed
77
8DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.5)'8DEB_DH_MAKESHLIBS_ARGS_libindicator0 += -V 'libindicator0 (>= 0.3.6)'
99
=== modified file 'libindicator/Makefile.am'
--- libindicator/Makefile.am 2010-03-10 17:45:53 +0000
+++ libindicator/Makefile.am 2010-03-18 16:33:19 +0000
@@ -1,6 +1,6 @@
1BUILT_SOURCES = 1BUILT_SOURCES = indicator-object-enum-types.h indicator-object-enum-types.c
2CLEANFILES = 2CLEANFILES =
3DISTCLEANFILES = 3DISTCLEANFILES =
4EXTRA_DIST = \4EXTRA_DIST = \
5 indicator.pc.in5 indicator.pc.in
66
@@ -26,6 +26,7 @@
26 $(indicator_headers) \26 $(indicator_headers) \
27 dbus-shared.h \27 dbus-shared.h \
28 indicator-object.c \28 indicator-object.c \
29 indicator-object-enum-types.c \
29 indicator-desktop-shortcuts.c \30 indicator-desktop-shortcuts.c \
30 indicator-image-helper.c \31 indicator-image-helper.c \
31 indicator-object-marshal.h \32 indicator-object-marshal.h \
@@ -47,6 +48,29 @@
47glib_marshal_list = indicator-object-marshal.list48glib_marshal_list = indicator-object-marshal.list
48glib_marshal_prefix = _indicator_object_marshal49glib_marshal_prefix = _indicator_object_marshal
4950
51indicator-object-enum-types.h: s-enum-types-h
52 @true
53s-enum-types-h: $(indicator_headers)
54 ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.h.template \
55 $(indicator_headers) ) >> tmp-indicator-object-enum-types.h \
56 && (cmp -s tmp-indicator-object-enum-types.h indicator-object-enum-types.h || cp tmp-indicator-object-enum-types.h indicator-object-enum-types.h ) \
57 && rm -f tmp-indicator-object-enum-types.h && echo timestamp > $(@F)
58
59indicator-object-enum-types.c: s-enum-types-c
60 @true
61s-enum-types-c: $(indicator_headers)
62 ( cd $(srcdir) && $(GLIB_MKENUMS) --template $(srcdir)/indicator-object-enum-types.c.template \
63 $(indicator_headers) ) > tmp-indicator-object-enum-types.c \
64 && (cmp -s tmp-indicator-object-enum-types.c indicator-object-enum-types.c || cp tmp-indicator-object-enum-types.c indicator-object-enum-types.c ) \
65 && rm -f tmp-indicator-object-enum-types.c
66
67EXTRA_DIST += indicator-object-enum-types.h
68CLEANFILES += \
69 indicator-object-enum-types.h \
70 indicator-object-enum-types.c \
71 s-enum-types-h \
72 s-enum-types-c
73
50##################################74##################################
51# DBus Specs75# DBus Specs
52##################################76##################################
5377
=== added file 'libindicator/indicator-object-enum-types.c.template'
--- libindicator/indicator-object-enum-types.c.template 1970-01-01 00:00:00 +0000
+++ libindicator/indicator-object-enum-types.c.template 2010-03-18 16:33:19 +0000
@@ -0,0 +1,30 @@
1/*** BEGIN file-header ***/
2#include "indicator-object-enum-types.h"
3/*** END file-header ***/
4
5/*** BEGIN file-production ***/
6/* enumerations from "@filename@" */
7#include "@filename@"
8/*** END file-production ***/
9
10/*** BEGIN value-header ***/
11GType
12@enum_name@_get_type (void) {
13 static GType enum_type_id = 0;
14 if (G_UNLIKELY (!enum_type_id))
15 {
16 static const G@Type@Value values[] = {
17/*** END value-header ***/
18
19/*** BEGIN value-production ***/
20 { @VALUENAME@, "@VALUENAME@", "@valuenick@" },
21/*** END value-production ***/
22
23/*** BEGIN value-tail ***/
24 { 0, NULL, NULL }
25 };
26 enum_type_id = g_@type@_register_static (g_intern_static_string ("@EnumName@"), values);
27 }
28 return enum_type_id;
29}
30/*** END value-tail ***/
031
=== added file 'libindicator/indicator-object-enum-types.h.template'
--- libindicator/indicator-object-enum-types.h.template 1970-01-01 00:00:00 +0000
+++ libindicator/indicator-object-enum-types.h.template 2010-03-18 16:33:19 +0000
@@ -0,0 +1,27 @@
1/*** BEGIN file-header ***/
2
3#ifndef __INDICATOR_OBJECT_ENUM_TYPES_H__
4#define __INDICATOR_OBJECT_ENUM_TYPES_H__
5
6#include <glib-object.h>
7
8G_BEGIN_DECLS
9
10/*** END file-header ***/
11
12/*** BEGIN file-production ***/
13/* enumerations from "@filename@" */
14/*** END file-production ***/
15
16/*** BEGIN file-tail ***/
17G_END_DECLS
18
19#endif /* !__INDICATOR_OBJECT_ENUM_TYPES_H__ */
20/*** END file-tail ***/
21
22/*** BEGIN value-header ***/
23
24GType @enum_name@_get_type (void) G_GNUC_CONST;
25#define INDICATOR_OBJECT_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
26
27/*** END value-header ***/
028
=== modified file 'libindicator/indicator-object-marshal.list'
--- libindicator/indicator-object-marshal.list 2010-01-15 21:16:30 +0000
+++ libindicator/indicator-object-marshal.list 2010-03-18 16:33:19 +0000
@@ -1,1 +1,2 @@
1VOID: POINTER, UINT, UINT1VOID: POINTER, UINT, UINT
2VOID: UINT,ENUM
23
=== modified file 'libindicator/indicator-object.c'
--- libindicator/indicator-object.c 2010-01-15 22:08:35 +0000
+++ libindicator/indicator-object.c 2010-03-18 16:33:19 +0000
@@ -28,6 +28,7 @@
28#include "indicator.h"28#include "indicator.h"
29#include "indicator-object.h"29#include "indicator-object.h"
30#include "indicator-object-marshal.h"30#include "indicator-object-marshal.h"
31#include "indicator-object-enum-types.h"
3132
32/**33/**
33 IndicatorObjectPrivate:34 IndicatorObjectPrivate:
@@ -56,6 +57,7 @@
56 ENTRY_ADDED,57 ENTRY_ADDED,
57 ENTRY_REMOVED,58 ENTRY_REMOVED,
58 ENTRY_MOVED,59 ENTRY_MOVED,
60 SCROLL,
59 LAST_SIGNAL61 LAST_SIGNAL
60};62};
6163
@@ -142,6 +144,25 @@
142 _indicator_object_marshal_VOID__POINTER_UINT_UINT,144 _indicator_object_marshal_VOID__POINTER_UINT_UINT,
143 G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE);145 G_TYPE_NONE, 3, G_TYPE_POINTER, G_TYPE_UINT, G_TYPE_UINT, G_TYPE_NONE);
144146
147
148 /**
149 IndicatorObject::scroll:
150 @arg0: The #IndicatorObject object
151 @arg1: The delta of the scroll event
152 @arg2: The orientation of the scroll event.
153
154 When the indicator receives a mouse scroll wheel event
155 from the user, this signal is emitted.
156 */
157 signals[SCROLL] = g_signal_new (INDICATOR_OBJECT_SIGNAL_SCROLL,
158 G_TYPE_FROM_CLASS(klass),
159 G_SIGNAL_RUN_LAST,
160 G_STRUCT_OFFSET (IndicatorObjectClass, scroll),
161 NULL, NULL,
162 _indicator_object_marshal_VOID__UINT_ENUM,
163 G_TYPE_NONE, 2, G_TYPE_UINT, INDICATOR_OBJECT_TYPE_SCROLL_DIRECTION);
164
165
145 return;166 return;
146}167}
147168
@@ -188,7 +209,7 @@
188indicator_object_finalize (GObject *object)209indicator_object_finalize (GObject *object)
189{210{
190 IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object);211 IndicatorObjectPrivate * priv = INDICATOR_OBJECT_GET_PRIVATE(object);
191 212
192 if (priv->module != NULL) {213 if (priv->module != NULL) {
193 /* Wow, this is convoluted. So basically we want to unref214 /* Wow, this is convoluted. So basically we want to unref
194 the module which will cause the code it included to be215 the module which will cause the code it included to be
@@ -211,7 +232,7 @@
211232
212 This function builds an #IndicatorObject using the symbols233 This function builds an #IndicatorObject using the symbols
213 that are found in @file. The module is loaded and the234 that are found in @file. The module is loaded and the
214 references are all kept by the object. To unload the 235 references are all kept by the object. To unload the
215 module the object must be destroyed.236 module the object must be destroyed.
216237
217 Return value: A valid #IndicatorObject or #NULL if error.238 Return value: A valid #IndicatorObject or #NULL if error.
@@ -304,7 +325,7 @@
304/* The default get entries function uses the other single325/* The default get entries function uses the other single
305 entries in the class to create an entry structure and326 entries in the class to create an entry structure and
306 put it into a list. This makes it simple for simple objects327 put it into a list. This makes it simple for simple objects
307 to create the list. Small changes from the way they 328 to create the list. Small changes from the way they
308 previously were. */329 previously were. */
309static GList *330static GList *
310get_entries_default (IndicatorObject * io)331get_entries_default (IndicatorObject * io)
311332
=== modified file 'libindicator/indicator-object.h'
--- libindicator/indicator-object.h 2010-01-15 21:04:20 +0000
+++ libindicator/indicator-object.h 2010-03-18 16:33:19 +0000
@@ -24,11 +24,18 @@
24#ifndef __INDICATOR_OBJECT_H__24#ifndef __INDICATOR_OBJECT_H__
25#define __INDICATOR_OBJECT_H__25#define __INDICATOR_OBJECT_H__
2626
27#include <glib.h>27#include <gtk/gtk.h>
28#include <glib-object.h>
2928
30G_BEGIN_DECLS29G_BEGIN_DECLS
3130
31typedef enum
32{
33 INDICATOR_OBJECT_SCROLL_UP,
34 INDICATOR_OBJECT_SCROLL_DOWN,
35 INDICATOR_OBJECT_SCROLL_LEFT,
36 INDICATOR_OBJECT_SCROLL_RIGHT
37} IndicatorScrollDirection;
38
32#define INDICATOR_OBJECT_TYPE (indicator_object_get_type ())39#define INDICATOR_OBJECT_TYPE (indicator_object_get_type ())
33#define INDICATOR_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_OBJECT_TYPE, IndicatorObject))40#define INDICATOR_OBJECT(obj) (G_TYPE_CHECK_INSTANCE_CAST ((obj), INDICATOR_OBJECT_TYPE, IndicatorObject))
34#define INDICATOR_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_OBJECT_TYPE, IndicatorObjectClass))41#define INDICATOR_OBJECT_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST ((klass), INDICATOR_OBJECT_TYPE, IndicatorObjectClass))
@@ -42,6 +49,8 @@
42#define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE))49#define INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_REMOVED, INDICATOR_OBJECT_TYPE))
43#define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved"50#define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED "entry-moved"
44#define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE))51#define INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_ENTRY_MOVED, INDICATOR_OBJECT_TYPE))
52#define INDICATOR_OBJECT_SIGNAL_SCROLL "scroll"
53#define INDICATOR_OBJECT_SIGNAL_SCROLL_ID (g_signal_lookup(INDICATOR_OBJECT_SIGNAL_SCROLL, INDICATOR_OBJECT_TYPE))
4554
46typedef struct _IndicatorObject IndicatorObject;55typedef struct _IndicatorObject IndicatorObject;
47typedef struct _IndicatorObjectClass IndicatorObjectClass;56typedef struct _IndicatorObjectClass IndicatorObjectClass;
@@ -75,7 +84,7 @@
75*/84*/
76struct _IndicatorObjectClass {85struct _IndicatorObjectClass {
77 GObjectClass parent_class;86 GObjectClass parent_class;
78 87
79 /* Virtual Functions */88 /* Virtual Functions */
80 GtkLabel * (*get_label) (IndicatorObject * io);89 GtkLabel * (*get_label) (IndicatorObject * io);
81 GtkImage * (*get_image) (IndicatorObject * io);90 GtkImage * (*get_image) (IndicatorObject * io);
@@ -85,13 +94,13 @@
85 guint (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);94 guint (*get_location) (IndicatorObject * io, IndicatorObjectEntry * entry);
8695
87 /* Signals */96 /* Signals */
88 void (*entry_added) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);97 void (*entry_added) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
89 void (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);98 void (*entry_removed) (IndicatorObject * io, IndicatorObjectEntry * entry, gpointer user_data);
90 void (*entry_moved) (IndicatorObject * io, IndicatorObjectEntry * entry, guint old_pos, guint new_pos, gpointer user_data);99 void (*entry_moved) (IndicatorObject * io, IndicatorObjectEntry * entry, guint old_pos, guint new_pos, gpointer user_data);
100 void (*scroll) (IndicatorObject * io, gint delta, IndicatorScrollDirection direction);
91101
92 /* Reserved */102 /* Reserved */
93 void (* indicator_object_reserved_1) (void);103 void (* indicator_object_reserved_1) (void);
94 void (* indicator_object_reserved_2) (void);
95};104};
96105
97/**106/**

Subscribers

People subscribed via source and target branches

to all changes: