[maemo-commits] [maemo-commits] r14488 - in projects/haf/trunk/hildon-desktop: . libhildondesktop
From: subversion at stage.maemo.org subversion at stage.maemo.orgDate: Wed Oct 17 20:48:15 EEST 2007
- Previous message: [maemo-commits] r14486 - projects/haf/branches/hildon-help/gtk-doc/debian
- Next message: [maemo-commits] r14489 - in projects/haf/trunk/hildon-desktop: . libhildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]
Author: elmarco Date: 2007-10-17 20:47:50 +0300 (Wed, 17 Oct 2007) New Revision: 14488 Modified: projects/haf/trunk/hildon-desktop/ChangeLog projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-item-socket.c projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.c projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.h projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.c projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.h projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.c projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.h projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.c projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.h projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.c projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.h Log: libhildondesktop: remove PRIVATE macros from public headers Modified: projects/haf/trunk/hildon-desktop/ChangeLog =================================================================== --- projects/haf/trunk/hildon-desktop/ChangeLog 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/ChangeLog 2007-10-17 17:47:50 UTC (rev 14488) @@ -1,5 +1,19 @@ 2007-10-17 Marc-Andre Lureau <marcandre.lureau at nokia.com> + * libhildondesktop/hildon-log.c: + * libhildondesktop/hildon-log.h: + * libhildondesktop/statusbar-item-binding.c: + * libhildondesktop/statusbar-item-binding.h: + * libhildondesktop/statusbar-item-socket.h: + * libhildondesktop/statusbar-item-socket.c: + * libhildondesktop/statusbar-item-wrapper.c: + * libhildondesktop/statusbar-item-wrapper.h: + * libhildondesktop/tasknavigator-item-socket.c: + * libhildondesktop/tasknavigator-item-socket.h: + remove _PRIVATE macros from public headers. + +2007-10-17 Marc-Andre Lureau <marcandre.lureau at nokia.com> + * doc/Makefile.am: fix GtkDoc documentation build. Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-item-socket.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-item-socket.c 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-desktop-item-socket.c 2007-10-17 17:47:50 UTC (rev 14488) @@ -30,7 +30,7 @@ static void hildon_desktop_item_socket_base_init (gpointer g_class); -GType +GType hildon_desktop_item_socket_get_type (void) { static GType item_socket_type = 0; @@ -55,7 +55,7 @@ &item_socket_info, 0); g_type_interface_add_prerequisite (item_socket_type, HILDON_DESKTOP_TYPE_ITEM); - + } return item_socket_type; @@ -82,13 +82,13 @@ G_STRUCT_OFFSET (HildonDesktopItemSocketIface, plug_removed), g_signal_accumulator_true_handled, NULL, gtk_marshal_BOOLEAN__VOID, - G_TYPE_BOOLEAN, 0); + G_TYPE_BOOLEAN, 0); initialized = TRUE; } } -void +void hildon_desktop_item_socket_add_id (HildonDesktopItemSocket *itemsocket, GdkNativeWindow window_id) { HildonDesktopItemSocketIface *iface; @@ -99,11 +99,11 @@ g_return_if_fail (iface != NULL); g_return_if_fail (iface->add_id != NULL); - + (* iface->add_id) (itemsocket,window_id); } -GdkNativeWindow +GdkNativeWindow hildon_desktop_item_socket_get_id (HildonDesktopItemSocket *itemsocket) { HildonDesktopItemSocketIface *iface; @@ -114,7 +114,7 @@ g_assert (iface != NULL); g_return_val_if_fail (iface->get_id != NULL,0); /* FIXME: are you sure you can return this? */ - + return (* iface->get_id) (itemsocket); } Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.c 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.c 2007-10-17 17:47:50 UTC (rev 14488) @@ -33,6 +33,8 @@ #include <sys/stat.h> #include <fcntl.h> +#define HILDON_LOG_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), HILDON_LOG_TYPE, HildonLogPrivate)); + static GObjectClass *parent_class; typedef struct _HildonLogPrivate HildonLogPrivate; @@ -100,7 +102,7 @@ return log_type; } -static void +static void hildon_log_class_init (HildonLogClass *log_class) { GObjectClass *object_class = G_OBJECT_CLASS (log_class); @@ -109,7 +111,7 @@ parent_class = g_type_class_peek_parent( log_class ); - + object_class->finalize = hildon_log_finalize; object_class->set_property = hildon_log_set_property; object_class->get_property = hildon_log_get_property; @@ -128,7 +130,7 @@ log_class->get_incomplete_groups = hildon_log_get_incomplete_groups; } -static void +static void hildon_log_finalize (GObject *object) { HildonLog *log = HILDON_LOG (object); @@ -143,7 +145,7 @@ G_OBJECT_CLASS (parent_class)->finalize (object); } /* -static GObject * +static GObject * hildon_log_constructor (GType type, guint n_construct_properties, GObjectConstructParam *construct_params) @@ -160,24 +162,24 @@ priv->fp = fopen (priv->filename,"w+"); priv->flag_working = (priv->fp) ? TRUE : FALSE; - + return object; }*/ -static void +static void hildon_log_open_file (HildonLog *log) { HildonLogPrivate *priv = HILDON_LOG_GET_PRIVATE (log); - priv->fp = open (priv->filename, - O_CREAT | O_RDWR | O_APPEND, + priv->fp = open (priv->filename, + O_CREAT | O_RDWR | O_APPEND, S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP); if (priv->fp == -1){ perror("fopen");priv->fp=0; } } -static void +static void hildon_log_close_file (HildonLog *log) { HildonLogPrivate *priv = HILDON_LOG_GET_PRIVATE (log); @@ -187,10 +189,10 @@ close (priv->fp); } -static void -hildon_log_set_property (GObject *object, - guint prop_id, - const GValue *value, +static void +hildon_log_set_property (GObject *object, + guint prop_id, + const GValue *value, GParamSpec *pspec) { HildonLog *log = HILDON_LOG (object); @@ -208,10 +210,10 @@ } -static void -hildon_log_get_property (GObject *object, - guint prop_id, - GValue *value, +static void +hildon_log_get_property (GObject *object, + guint prop_id, + GValue *value, GParamSpec *pspec) { HildonLog *log = HILDON_LOG (object); @@ -228,7 +230,7 @@ } } -static void +static void hildon_log_init( HildonLog *log ) { HildonLogPrivate *priv; @@ -236,12 +238,12 @@ g_return_if_fail( log ); priv = HILDON_LOG_GET_PRIVATE (log); - + priv->fp = 0; priv->filename = NULL; } -static HildonLogPrivate * +static HildonLogPrivate * hildon_log_check_util (HildonLog *log) { HildonLogPrivate *priv = NULL; @@ -258,9 +260,9 @@ hildon_log_new (const gchar *filename) { return g_object_new (HILDON_LOG_TYPE,"filename",filename, NULL); -} +} -void +void hildon_log_remove_file (HildonLog *log) { HildonLogPrivate *priv = hildon_log_check_util (log); @@ -273,47 +275,47 @@ return; /* signal warning there is no filename ???? */ } -void +void hildon_log_add_group (HildonLog *log, const gchar *group) { HildonLogPrivate *priv = hildon_log_check_util (log); gchar *buf = NULL; g_return_if_fail (priv); - + buf = g_strdup_printf ("[%s]\n",group); - + hildon_log_open_file (log); - + g_return_if_fail (priv->fp); - + write (priv->fp,buf,strlen (buf)); - + hildon_log_close_file (log); - + g_free (buf); } -void -hildon_log_add_message (HildonLog *log, - const gchar *key, +void +hildon_log_add_message (HildonLog *log, + const gchar *key, const gchar *message) { HildonLogPrivate *priv = hildon_log_check_util (log); gchar *buf = NULL; g_return_if_fail (priv); - + hildon_log_open_file (log); - + g_return_if_fail (priv->fp); - + buf = g_strdup_printf ("%s=%s\n",key,message); - + write (priv->fp,buf,strlen (buf)); hildon_log_close_file (log); - + g_free (buf); } @@ -334,8 +336,8 @@ while ( (key = va_arg(keys,gchar *)) != NULL ) keylist = g_list_append (keylist,key); - + va_end (keys); g_return_val_if_fail (priv,NULL); @@ -352,7 +354,7 @@ } groups = g_key_file_get_groups(keyfile, NULL); - + while (groups[i]) { for (l = keylist ; l != NULL ; l = l->next ) @@ -370,7 +372,7 @@ } } /* next group */ - g_free (groups[i]); + g_free (groups[i]); i++; } } Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.h =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.h 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/hildon-log.h 2007-10-17 17:47:50 UTC (rev 14488) @@ -25,7 +25,7 @@ /** * @file hildon-log.h * @brief -* +* */ #ifndef HILDON_LOG_H @@ -45,11 +45,8 @@ HILDON_LOG_TYPE)) #define HILDON_IS_LOG_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), \ HILDON_LOG_TYPE)) -#define HILDON_LOG_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE ((obj), \ - HILDON_LOG_TYPE, HildonLogPrivate)); - -typedef struct _HildonLog HildonLog; + +typedef struct _HildonLog HildonLog; typedef struct _HildonLogClass HildonLogClass; struct _HildonLog @@ -64,8 +61,8 @@ void (*remove_file) (HildonLog *log); void (*add_group) (HildonLog *log, const gchar *group); - void (*add_message) (HildonLog *log, - const gchar *key, + void (*add_message) (HildonLog *log, + const gchar *key, const gchar *message); GList* (*get_incomplete_groups) (HildonLog *log, ...); Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.c 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.c 2007-10-17 17:47:50 UTC (rev 14488) @@ -28,6 +28,8 @@ #include "statusbar-item-binding.h" +#define STATUSBAR_ITEM_BINDING_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), STATUSBAR_TYPE_ITEM_BINDING, StatusbarItemBindingPrivate)); + enum { PROP_0, @@ -73,7 +75,7 @@ { (GInterfaceInitFunc) statusbar_item_binding_iface_init, NULL, - NULL + NULL }; item_type = g_type_register_static (STATUSBAR_TYPE_ITEM, @@ -85,26 +87,26 @@ HILDON_DESKTOP_TYPE_ITEM_PLUG, &item_binding_info); } - + return item_type; } -static void +static void statusbar_item_binding_iface_init (HildonDesktopItemPlugIface *iface) { iface->get_id = statusbar_item_binding_get_id; iface->embedded = statusbar_item_binding_embedded; } -static void +static void statusbar_item_binding_proxy_embedded (GtkPlug *binding, StatusbarItemBinding *itembinding) { g_signal_emit_by_name (itembinding, "embedded"); } GObject * -statusbar_item_binding_constructor (GType gtype, - guint n_params, +statusbar_item_binding_constructor (GType gtype, + guint n_params, GObjectConstructParam *params) { GObject *self; @@ -118,13 +120,13 @@ g_object_get (self, "wid", &wid, NULL); itembinding = STATUSBAR_ITEM_BINDING (self); - + itembinding->plug = GTK_PLUG (gtk_plug_new (wid)); - + gtk_container_add (GTK_CONTAINER (itembinding), GTK_WIDGET (itembinding->plug)); gtk_widget_show (GTK_WIDGET (itembinding->plug)); - g_signal_connect (G_OBJECT (itembinding->plug), + g_signal_connect (G_OBJECT (itembinding->plug), "embedded", G_CALLBACK (statusbar_item_binding_proxy_embedded), (gpointer)itembinding); @@ -132,10 +134,10 @@ return self; } -static void +static void statusbar_item_binding_class_init (StatusbarItemBindingClass *itembinding_class) { - GObjectClass *object_class = G_OBJECT_CLASS (itembinding_class); + GObjectClass *object_class = G_OBJECT_CLASS (itembinding_class); GtkContainerClass *container_class = GTK_CONTAINER_CLASS (itembinding_class); object_class->constructor = statusbar_item_binding_constructor; @@ -156,17 +158,17 @@ } -static void +static void statusbar_item_binding_add (GtkContainer *container, GtkWidget *widget) { - g_assert (GTK_IS_CONTAINER (container) && + g_assert (GTK_IS_CONTAINER (container) && GTK_IS_WIDGET (widget) && STATUSBAR_IS_ITEM_BINDING (container)); gtk_container_add (GTK_CONTAINER (STATUSBAR_ITEM_BINDING (container)->plug),widget); } -static GdkNativeWindow +static GdkNativeWindow statusbar_item_binding_get_id (HildonDesktopItemPlug *desktop_plug) { StatusbarItemBinding *itembinding = (StatusbarItemBinding *) desktop_plug; @@ -174,9 +176,9 @@ return gtk_plug_get_id (itembinding->plug); } -static void +static void statusbar_item_binding_embedded (HildonDesktopItemPlug *desktop_plug) -{ +{ StatusbarItemBinding *itembinding = (StatusbarItemBinding *) desktop_plug; if (GTK_PLUG_GET_CLASS (itembinding->plug)->embedded) Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.h =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.h 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-binding.h 2007-10-17 17:47:50 UTC (rev 14488) @@ -37,9 +37,8 @@ #define STATUSBAR_ITEM_BINDING_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), STATUSBAR_TYPE_ITEM_BINDING, StatusbarItemBindingClass)) #define STATUSBAR_IS_ITEM_BINDING(obj) (GTK_CHECK_TYPE (obj, STATUSBAR_TYPE_ITEM_BINDING)) #define STATUSBAR_IS_ITEM_BINDING_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), STATUSBAR_TYPE_ITEM_BINDING)) -#define STATUSBAR_ITEM_BINDING_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), STATUSBAR_TYPE_ITEM_BINDING, StatusbarItemBindingPrivate)); -typedef struct _StatusbarItemBinding StatusbarItemBinding; +typedef struct _StatusbarItemBinding StatusbarItemBinding; typedef struct _StatusbarItemBindingClass StatusbarItemBindingClass; struct _StatusbarItemBinding Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.c 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.c 2007-10-17 17:47:50 UTC (rev 14488) @@ -28,6 +28,8 @@ #include "statusbar-item-socket.h" +#define STATUSBAR_ITEM_SOCKET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), STATUSBAR_TYPE_ITEM_SOCKET, StatusbarItemSocketPrivate)); + static void statusbar_item_socket_init (StatusbarItemSocket *itemsocket); static void statusbar_item_socket_class_init (StatusbarItemSocketClass *itemsocket_class); @@ -62,7 +64,7 @@ { (GInterfaceInitFunc) statusbar_item_socket_iface_init, NULL, - NULL + NULL }; item_type = g_type_register_static (STATUSBAR_TYPE_ITEM, @@ -74,11 +76,11 @@ HILDON_DESKTOP_TYPE_ITEM_SOCKET, &item_socket_info); } - + return item_type; } -static void +static void statusbar_item_socket_iface_init (HildonDesktopItemSocketIface *iface) { iface->add_id = statusbar_item_socket_add_id; @@ -87,29 +89,29 @@ iface->plug_removed = NULL; } -static void +static void statusbar_item_socket_proxy_plug_added (GtkSocket *socket, StatusbarItemSocket *itemsocket) { g_signal_emit_by_name (itemsocket, "plug-added"); } -static void +static void statusbar_item_socket_add_socket (StatusbarItemSocket *itemsocket, gpointer data) -{ +{ gtk_widget_show (GTK_WIDGET (itemsocket->socket)); - + gdk_window_set_back_pixmap (GTK_WIDGET (itemsocket->socket)->window, NULL, TRUE); gdk_window_clear (GTK_WIDGET (itemsocket->socket)->window); } -static void +static void statusbar_item_socket_init (StatusbarItemSocket *itemsocket) { - + itemsocket->socket = GTK_SOCKET (gtk_socket_new ()); gtk_container_add (GTK_CONTAINER (itemsocket), GTK_WIDGET (itemsocket->socket)); - - g_signal_connect (G_OBJECT (itemsocket->socket), + + g_signal_connect (G_OBJECT (itemsocket->socket), "plug-added", G_CALLBACK (statusbar_item_socket_proxy_plug_added), (gpointer)itemsocket); @@ -120,23 +122,23 @@ NULL); } -static void +static void statusbar_item_socket_class_init (StatusbarItemSocketClass *itemsocket_class) { /* TODO: fill me up before you go go! */ } -static void +static void statusbar_item_socket_add_id (HildonDesktopItemSocket *itemsocket, GdkNativeWindow window_id) { StatusbarItemSocket *statusbar_item = (StatusbarItemSocket *) itemsocket; gtk_socket_add_id (statusbar_item->socket, window_id); - statusbar_item->wid = window_id; + statusbar_item->wid = window_id; } -static GdkNativeWindow +static GdkNativeWindow statusbar_item_socket_get_id (HildonDesktopItemSocket *itemsocket) { StatusbarItemSocket *statusbar_item = (StatusbarItemSocket *) itemsocket; @@ -144,9 +146,9 @@ return gtk_socket_get_id (statusbar_item->socket); } -static void +static void statusbar_item_socket_plug_added (HildonDesktopItemSocket *itemsocket) -{ +{ StatusbarItemSocket *statusbar_item = (StatusbarItemSocket *) itemsocket; if (GTK_SOCKET_GET_CLASS (statusbar_item->socket)->plug_added) Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.h =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.h 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-socket.h 2007-10-17 17:47:50 UTC (rev 14488) @@ -36,9 +36,8 @@ #define STATUSBAR_ITEM_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), STATUSBAR_TYPE_ITEM_SOCKET, StatusbarItemSocketClass)) #define STATUSBAR_IS_ITEM_SOCKET(obj) (GTK_CHECK_TYPE (obj, STATUSBAR_TYPE_ITEM_SOCKET)) #define STATUSBAR_IS_ITEM_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), STATUSBAR_TYPE_ITEM_SOCKET)) -#define STATUSBAR_ITEM_SOCKET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), STATUSBAR_TYPE_ITEM_SOCKET, StatusbarItemSocketPrivate)); -typedef struct _StatusbarItemSocket StatusbarItemSocket; +typedef struct _StatusbarItemSocket StatusbarItemSocket; typedef struct _StatusbarItemSocketClass StatusbarItemSocketClass; struct _StatusbarItemSocket Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.c 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.c 2007-10-17 17:47:50 UTC (rev 14488) @@ -34,6 +34,8 @@ #include <libintl.h> #include <locale.h> +#define STATUSBAR_ITEM_WRAPPER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), STATUSBAR_TYPE_ITEM_WRAPPER, StatusbarItemWrapperPrivate)); + typedef struct _StatusbarItemWrapperPrivate StatusbarItemWrapperPrivate; struct _StatusbarItemWrapperPrivate @@ -53,7 +55,7 @@ SB_SIGNALS_LOG }; -enum +enum { SB_WRAPPER_PROP_0, SB_WRAPPER_PROP_LIB @@ -68,7 +70,7 @@ static StatusbarItemClass *parent_class; /* helper functions */ -static gboolean statusbar_item_wrapper_load_symbols( +static gboolean statusbar_item_wrapper_load_symbols( StatusbarItemWrapper *item ); static void statusbar_item_wrapper_warning_function( void ); @@ -111,11 +113,11 @@ &item_info, 0); } - + return item_type; } -static void +static void statusbar_item_wrapper_class_init (StatusbarItemWrapperClass *item_class) { /* set convenience variables */ @@ -136,28 +138,28 @@ object_class->get_property = statusbar_item_wrapper_get_property; object_class->set_property = statusbar_item_wrapper_set_property; - statusbar_class->condition_update = statusbar_item_wrapper_update_conditional_cb; + statusbar_class->condition_update = statusbar_item_wrapper_update_conditional_cb; /* TODO: Implement watchdog - statusbar_log_signals[SB_SIGNAL_LOG_START] = + statusbar_log_signals[SB_SIGNAL_LOG_START] = g_signal_new("hildon_status_bar_log_start", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET - (StatusbarItemWrapperClass, + (StatusbarItemWrapperClass, hildon_status_bar_log_start), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); - statusbar_log_signals[SB_SIGNAL_LOG_END] = + statusbar_log_signals[SB_SIGNAL_LOG_END] = g_signal_new("hildon_status_bar_log_end", G_OBJECT_CLASS_TYPE(object_class), G_SIGNAL_RUN_FIRST, G_STRUCT_OFFSET - (StatusbarItemWrapperClass, + (StatusbarItemWrapperClass, hildon_status_bar_log_end), NULL, NULL, - g_cclosure_marshal_VOID__VOID, + g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0); */ @@ -175,7 +177,7 @@ { StatusbarItemWrapperPrivate *priv; - g_return_if_fail (item); + g_return_if_fail (item); priv = STATUSBAR_ITEM_WRAPPER_GET_PRIVATE( item ); @@ -185,36 +187,36 @@ priv->data = NULL; priv->fn = g_new0 (StatusbarItemWrapperAPI_st, 1); - priv->entryfn = - (StatusbarItemWrapperEntryFn) + priv->entryfn = + (StatusbarItemWrapperEntryFn) statusbar_item_wrapper_warning_function; - priv->fn->initialize = - (StatusbarItemWrapperInitializeFn) + priv->fn->initialize = + (StatusbarItemWrapperInitializeFn) statusbar_item_wrapper_warning_function; - priv->fn->destroy = - (StatusbarItemWrapperDestroyFn) + priv->fn->destroy = + (StatusbarItemWrapperDestroyFn) statusbar_item_wrapper_warning_function; priv->fn->update = - (StatusbarItemWrapperUpdateFn) + (StatusbarItemWrapperUpdateFn) statusbar_item_wrapper_warning_function; - priv->fn->get_priority = - (StatusbarItemWrapperGetPriorityFn) + priv->fn->get_priority = + (StatusbarItemWrapperGetPriorityFn) statusbar_item_wrapper_warning_function; - priv->fn->set_conditional = + priv->fn->set_conditional = (StatusbarItemWrapperSetConditionalFn) statusbar_item_wrapper_warning_function; - + GTK_WIDGET_SET_FLAGS (item, GTK_NO_WINDOW); } -static GObject * -statusbar_item_wrapper_constructor (GType gtype, - guint n_params, +static GObject * +statusbar_item_wrapper_constructor (GType gtype, + guint n_params, GObjectConstructParam *params) { GObject *self; @@ -235,7 +237,7 @@ gtk_object_sink (GTK_OBJECT (self)); /* FIXME: This or unref? */ return self; /* FIXME: NULL or self? */ } - + entryAPI_name = g_strdup_printf( "%s_entry", HILDON_DESKTOP_ITEM (self)->name); priv->entryfn = (StatusbarItemWrapperEntryFn) dlsym (priv->dlhandle, entryAPI_name); @@ -256,8 +258,8 @@ return self; /* FIXME: NULL or self? */ } - /* FIXME: Move this out!!!! - g_signal_emit (G_OBJECT(item), statusbar_log_signals[SB_SIGNAL_LOG_START], 0, NULL); + /* FIXME: Move this out!!!! + g_signal_emit (G_OBJECT(item), statusbar_log_signals[SB_SIGNAL_LOG_START], 0, NULL); */ /* Initialize the plugin */ @@ -265,7 +267,7 @@ /* Conditional plugins don't need to implement button on initialization */ if (button) - { + { g_object_set (G_OBJECT (button), "can-focus", FALSE, NULL); gtk_container_add (GTK_CONTAINER (self), button); } @@ -278,7 +280,7 @@ return self; } -static void +static void statusbar_item_wrapper_set_property (GObject *object, guint prop_id, const GValue *value, @@ -301,10 +303,10 @@ default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); break; - } + } } -static void +static void statusbar_item_wrapper_get_property (GObject *object, guint prop_id, GValue *value, @@ -325,11 +327,11 @@ break; default: G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); - break; + break; } } -static void +static void statusbar_item_wrapper_finalize (GObject *obj) { StatusbarItemWrapperPrivate *priv; @@ -343,7 +345,7 @@ priv->fn->destroy (priv->data); if (priv->dlhandle) - dlclose (priv->dlhandle); + dlclose (priv->dlhandle); g_free (priv->fn); g_free (priv->library); @@ -352,17 +354,17 @@ G_OBJECT_CLASS( parent_class )->finalize( obj ); } -static void +static void statusbar_item_wrapper_warning_function( void ) { - g_debug ("Item not properly loaded.\n" + g_debug ("Item not properly loaded.\n" "\tThis function is only called, if a item couldn't initialise " "itself properly.\n" "\tSee statusbar_item_wrapper_init/new for more information\n" ); } -static gboolean -statusbar_item_wrapper_load_symbols( StatusbarItemWrapper *item ) +static gboolean +statusbar_item_wrapper_load_symbols( StatusbarItemWrapper *item ) { StatusbarItemWrapperPrivate *priv; @@ -370,7 +372,7 @@ priv = STATUSBAR_ITEM_WRAPPER_GET_PRIVATE (item); - /* NULL the function pointers, so we detect easily if + /* NULL the function pointers, so we detect easily if * the plugin don't set them */ priv->fn->initialize = NULL; priv->fn->destroy = NULL; @@ -403,7 +405,7 @@ return FALSE; } - /* if plugin is conditional */ + /* if plugin is conditional */ if (priv->fn->set_conditional) STATUSBAR_ITEM (item)->conditional = FALSE; @@ -411,24 +413,24 @@ } StatusbarItemWrapper * -statusbar_item_wrapper_new (const gchar *name, - const gchar *library, +statusbar_item_wrapper_new (const gchar *name, + const gchar *library, gboolean mandatory) { StatusbarItemWrapper *item; - + g_return_val_if_fail (name && library, NULL); - item = g_object_new (STATUSBAR_TYPE_ITEM_WRAPPER, + item = g_object_new (STATUSBAR_TYPE_ITEM_WRAPPER, "name", name, "library", library, "mandatory", mandatory, NULL); - + return item; } -void +void statusbar_item_wrapper_update (StatusbarItemWrapper *item, gint value1, gint value2, @@ -444,14 +446,14 @@ g_object_ref (item); priv->fn->update (priv->data, value1, value2, str); g_object_unref (item); - } + } } /* Function for updating item conditional state */ -void -statusbar_item_wrapper_update_conditional_cb (StatusbarItem *sbitem, +void +statusbar_item_wrapper_update_conditional_cb (StatusbarItem *sbitem, gboolean user_data) -{ +{ StatusbarItemWrapper *item = STATUSBAR_ITEM_WRAPPER (sbitem); StatusbarItemWrapperPrivate *priv; Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.h =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.h 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/statusbar-item-wrapper.h 2007-10-17 17:47:50 UTC (rev 14488) @@ -33,11 +33,10 @@ #define STATUSBAR_ITEM_WRAPPER_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), STATUSBAR_TYPE_ITEM_WRAPPER, StatusbarItemWrapperClass)) #define STATUSBAR_IS_ITEM_WRAPPER(obj) (GTK_CHECK_TYPE (obj, STATUSBAR_TYPE_ITEM_WRAPPER)) #define STATUSBAR_IS_ITEM_WRAPPER_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), STATUSBAR_TYPE_ITEM_WRAPPER)) -#define STATUSBAR_ITEM_WRAPPER_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), STATUSBAR_TYPE_ITEM_WRAPPER, StatusbarItemWrapperPrivate)); -typedef struct _StatusbarItemWrapper StatusbarItemWrapper; +typedef struct _StatusbarItemWrapper StatusbarItemWrapper; typedef struct _StatusbarItemWrapperClass StatusbarItemWrapperClass; -typedef struct _StatusbarItemWrapperAPI_st StatusbarItemWrapperAPI_st; +typedef struct _StatusbarItemWrapperAPI_st StatusbarItemWrapperAPI_st; struct _StatusbarItemWrapper { @@ -47,27 +46,27 @@ struct _StatusbarItemWrapperClass { StatusbarItemClass parent_class; - + void (*statusbar_log_start) (StatusbarItemWrapper * self); void (*statusbar_log_end) (StatusbarItemWrapper * self); }; -/* Type definitions for the plugin API */ +/* Type definitions for the plugin API */ typedef void (*StatusbarItemWrapperEntryFn)( StatusbarItemWrapperAPI_st *fn ); typedef void *(*StatusbarItemWrapperInitializeFn)( StatusbarItemWrapper *item, GtkWidget **button); typedef void (*StatusbarItemWrapperDestroyFn)( void *data ); -typedef void (*StatusbarItemWrapperUpdateFn)( void *data, - gint value1, - gint value2, +typedef void (*StatusbarItemWrapperUpdateFn)( void *data, + gint value1, + gint value2, const gchar *str); typedef int (*StatusbarItemWrapperGetPriorityFn)( void *data ); -typedef void (*StatusbarItemWrapperSetConditionalFn)( void *data, +typedef void (*StatusbarItemWrapperSetConditionalFn)( void *data, gboolean cond ); /* Struct for the plugin API function pointers */ -struct _StatusbarItemWrapperAPI_st +struct _StatusbarItemWrapperAPI_st { StatusbarItemWrapperInitializeFn initialize; StatusbarItemWrapperDestroyFn destroy; @@ -78,13 +77,13 @@ GType statusbar_item_wrapper_get_type (void); -StatusbarItemWrapper *statusbar_item_wrapper_new (const gchar *name, - const gchar *library, +StatusbarItemWrapper *statusbar_item_wrapper_new (const gchar *name, + const gchar *library, gboolean mandatory); -void statusbar_item_wrapper_update (StatusbarItemWrapper *item, - gint value1, - gint value2, +void statusbar_item_wrapper_update (StatusbarItemWrapper *item, + gint value1, + gint value2, const gchar *str); void statusbar_item_wrapper_update_conditional_cb (StatusbarItem *sbitem, Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.c =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.c 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.c 2007-10-17 17:47:50 UTC (rev 14488) @@ -28,6 +28,8 @@ #include "tasknavigator-item-socket.h" +#define TASKNAVIGATOR_ITEM_SOCKET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TASKNAVIGATOR_TYPE_ITEM_SOCKET, TaskNavigatorItemSocketPrivate)); + static void tasknavigator_item_socket_init (TaskNavigatorItemSocket *itemsocket); static void tasknavigator_item_socket_class_init (TaskNavigatorItemSocketClass *itemsocket_class); @@ -64,7 +66,7 @@ { (GInterfaceInitFunc) tasknavigator_item_socket_iface_init, NULL, - NULL + NULL }; item_type = g_type_register_static (TASKNAVIGATOR_TYPE_ITEM, @@ -76,11 +78,11 @@ HILDON_DESKTOP_TYPE_ITEM_SOCKET, &item_socket_info); } - + return item_type; } -static void +static void tasknavigator_item_socket_iface_init (HildonDesktopItemSocketIface *iface) { iface->add_id = tasknavigator_item_socket_add_id; @@ -89,7 +91,7 @@ iface->plug_removed = tasknavigator_item_socket_plug_removed; } -static void +static void tasknavigator_item_socket_proxy_plug_added (GtkSocket *socket, TaskNavigatorItemSocket *itemsocket) { g_signal_emit_by_name (itemsocket, "plug-added"); @@ -102,40 +104,40 @@ return TRUE; } -static void +static void tasknavigator_item_socket_init (TaskNavigatorItemSocket *itemsocket) { itemsocket->socket = GTK_SOCKET (gtk_socket_new ()); - + gtk_container_add (GTK_CONTAINER (itemsocket), GTK_WIDGET (itemsocket->socket)); gtk_widget_show (GTK_WIDGET (itemsocket->socket)); - g_signal_connect (G_OBJECT (itemsocket->socket), + g_signal_connect (G_OBJECT (itemsocket->socket), "plug-added", G_CALLBACK (tasknavigator_item_socket_proxy_plug_added), (gpointer)itemsocket); - g_signal_connect (G_OBJECT (itemsocket->socket), + g_signal_connect (G_OBJECT (itemsocket->socket), "plug-removed", G_CALLBACK (tasknavigator_item_socket_proxy_plug_removed), (gpointer)itemsocket); } -static void +static void tasknavigator_item_socket_class_init (TaskNavigatorItemSocketClass *itemsocket_class) { /* TODO: fill me up before you go go! */ } -static void +static void tasknavigator_item_socket_add_id (HildonDesktopItemSocket *itemsocket, GdkNativeWindow window_id) { TaskNavigatorItemSocket *tasknavigator_item = (TaskNavigatorItemSocket *) itemsocket; - gtk_socket_add_id (tasknavigator_item->socket, window_id); + gtk_socket_add_id (tasknavigator_item->socket, window_id); } -static GdkNativeWindow +static GdkNativeWindow tasknavigator_item_socket_get_id (HildonDesktopItemSocket *itemsocket) { TaskNavigatorItemSocket *tasknavigator_item = (TaskNavigatorItemSocket *) itemsocket; @@ -143,16 +145,16 @@ return gtk_socket_get_id (tasknavigator_item->socket); } -static void +static void tasknavigator_item_socket_plug_added (HildonDesktopItemSocket *itemsocket) -{ +{ TaskNavigatorItemSocket *tasknavigator_item = (TaskNavigatorItemSocket *) itemsocket; if (GTK_SOCKET_GET_CLASS (tasknavigator_item->socket)->plug_added) GTK_SOCKET_GET_CLASS (tasknavigator_item->socket)->plug_added (tasknavigator_item->socket); } -static gboolean +static gboolean tasknavigator_item_socket_plug_removed (HildonDesktopItemSocket *itemsocket) { TaskNavigatorItemSocket *tasknavigator_item = (TaskNavigatorItemSocket *) itemsocket; Modified: projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.h =================================================================== --- projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.h 2007-10-17 17:34:25 UTC (rev 14487) +++ projects/haf/trunk/hildon-desktop/libhildondesktop/tasknavigator-item-socket.h 2007-10-17 17:47:50 UTC (rev 14488) @@ -36,9 +36,8 @@ #define TASKNAVIGATOR_ITEM_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_CAST ((klass), TASKNAVIGATOR_TYPE_ITEM_SOCKET, TaskNavigatorItemSocketClass)) #define TASKNAVIGATOR_IS_ITEM_SOCKET(obj) (GTK_CHECK_TYPE (obj, TASKNAVIGATOR_TYPE_ITEM_SOCKET)) #define TASKNAVIGATOR_IS_ITEM_SOCKET_CLASS(klass) (GTK_CHECK_CLASS_TYPE ((klass), TASKNAVIGATOR_TYPE_ITEM_SOCKET)) -#define TASKNAVIGATOR_ITEM_SOCKET_GET_PRIVATE(obj) (G_TYPE_INSTANCE_GET_PRIVATE ((obj), TASKNAVIGATOR_TYPE_ITEM_SOCKET, TaskNavigatorItemSocketPrivate)); -typedef struct _TaskNavigatorItemSocket TaskNavigatorItemSocket; +typedef struct _TaskNavigatorItemSocket TaskNavigatorItemSocket; typedef struct _TaskNavigatorItemSocketClass TaskNavigatorItemSocketClass; struct _TaskNavigatorItemSocket
- Previous message: [maemo-commits] r14486 - projects/haf/branches/hildon-help/gtk-doc/debian
- Next message: [maemo-commits] r14489 - in projects/haf/trunk/hildon-desktop: . libhildondesktop
- Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]