2008-11-04 Claudio Saavedra <csaavedra@igalia.com>
+ Reverting following commit:
+
+ 2008-10-13 Alberto Garcia <agarcia@igalia.com>
+
+ * src/hildon-app-menu-private.h
+ * src/hildon-app-menu.[ch]
+ * src/hildon-button.[ch]
+ * src/hildon-check-button.[ch]
+ * src/hildon-entry.[ch]
+ * src/hildon-pannable-area.[ch]
+ * src/hildon-text-view.[ch]:
+ Added private field to the object's structure.
+
+ because it causes an ABI breakage. We will need to introduce these
+ changes later at some point. See NB#91636 for an extensive
+ explanation and status.
+
+2008-11-04 Claudio Saavedra <csaavedra@igalia.com>
+
Patch contributed by Daniel Borgmann (danielb@openismus.com)
* src/hildon-window.c: (paint_toolbar): Update toolbar sizes and
g_return_if_fail (HILDON_IS_APP_MENU (menu));
g_return_if_fail (GTK_IS_BUTTON (item));
- priv = menu->priv;
+ priv = HILDON_APP_MENU_GET_PRIVATE(menu);
/* Add the item to the menu */
gtk_widget_show (GTK_WIDGET (item));
g_return_if_fail (GTK_IS_BUTTON (item));
g_return_if_fail (position >= 0);
- priv = menu->priv;
+ priv = HILDON_APP_MENU_GET_PRIVATE (menu);
old_position = g_list_index (priv->buttons, item);
g_return_if_fail (old_position >= 0);
g_return_if_fail (HILDON_IS_APP_MENU (menu));
g_return_if_fail (GTK_IS_BUTTON (filter));
- priv = menu->priv;
+ priv = HILDON_APP_MENU_GET_PRIVATE(menu);
/* Add the filter to the menu */
gtk_widget_show (GTK_WIDGET (filter));
g_return_if_fail (HILDON_IS_APP_MENU (menu));
g_return_if_fail (columns > 0);
- priv = menu->priv;
+ priv = HILDON_APP_MENU_GET_PRIVATE (menu);
if (columns != priv->columns) {
priv->columns = columns;
GParamSpec *arg1,
HildonAppMenu *menu)
{
- hildon_app_menu_repack_items (menu, g_list_index (menu->priv->buttons, item));
+ HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE (menu);
+
+ hildon_app_menu_repack_items (menu, g_list_index (priv->buttons, item));
}
static void
static void
hildon_app_menu_map (GtkWidget *widget)
{
- HildonAppMenuPrivate *priv = HILDON_APP_MENU (widget)->priv;
+ HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(widget);
GTK_WIDGET_CLASS (hildon_app_menu_parent_class)->map (widget);
static void
hildon_app_menu_unmap (GtkWidget *widget)
{
- HildonAppMenuPrivate *priv = HILDON_APP_MENU (widget)->priv;
+ HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(widget);
/* Remove the grab */
if (priv->transfer_window != NULL) {
GdkEventButton *event)
{
int x, y;
- HildonAppMenuPrivate *priv = HILDON_APP_MENU (widget)->priv;
+ HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(widget);
gdk_window_get_position (widget->window, &x, &y);
hildon_app_menu_button_release (GtkWidget *widget,
GdkEventButton *event)
{
- HildonAppMenuPrivate *priv = HILDON_APP_MENU (widget)->priv;
+ HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(widget);
if (priv->pressed_outside) {
int x, y;
GdkScreen *screen;
gint width;
guint horizontal_spacing, vertical_spacing, inner_border, external_border;
- HildonAppMenuPrivate *priv = HILDON_APP_MENU (widget)->priv;
+ HildonAppMenuPrivate *priv;
+
+ priv = HILDON_APP_MENU_GET_PRIVATE (widget);
gtk_widget_style_get (widget,
"horizontal-spacing", &horizontal_spacing,
static void
hildon_app_menu_repack_filters (HildonAppMenu *menu)
{
- HildonAppMenuPrivate *priv = menu->priv;
+ HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(menu);
GList *iter;
for (iter = priv->filters; iter != NULL; iter = iter->next) {
hildon_app_menu_repack_items (HildonAppMenu *menu,
gint start_from)
{
- HildonAppMenuPrivate *priv = menu->priv;
+ HildonAppMenuPrivate *priv;
gint row, col;
GList *iter;
+ priv = HILDON_APP_MENU_GET_PRIVATE(menu);
+
/* Remove buttons from their parent */
if (start_from != -1) {
for (iter = g_list_nth (priv->buttons, start_from); iter != NULL; iter = iter->next) {
GtkWidget *alignment;
HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(menu);
- menu->priv = priv;
-
/* Initialize private variables */
priv->parent_window = NULL;
priv->transfer_window = NULL;
static void
hildon_app_menu_finalize (GObject *object)
{
- HildonAppMenuPrivate *priv = HILDON_APP_MENU (object)->priv;
+ HildonAppMenuPrivate *priv = HILDON_APP_MENU_GET_PRIVATE(object);
if (priv->transfer_window)
gdk_window_destroy (priv->transfer_window);
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
HILDON_TYPE_BUTTON, HildonButtonPrivate));
+typedef struct _HildonButtonPrivate HildonButtonPrivate;
+
struct _HildonButtonPrivate
{
GtkLabel *title;
GtkStyle *previous_style)
{
guint horizontal_spacing, vertical_spacing, image_spacing;
- HildonButtonPrivate *priv = HILDON_BUTTON (widget)->priv;
+ HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (widget);
if (GTK_WIDGET_CLASS (hildon_button_parent_class)->style_set)
GTK_WIDGET_CLASS (hildon_button_parent_class)->style_set (widget, previous_style);
static void
hildon_button_finalize (GObject *object)
{
- HildonButtonPrivate *priv = HILDON_BUTTON (object)->priv;
+ HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (object);
g_object_unref (priv->alignment);
g_object_unref (priv->label_box);
{
HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (self);
- self->priv = priv;
-
priv->title = GTK_LABEL (gtk_label_new (NULL));
priv->value = GTK_LABEL (gtk_label_new (NULL));
priv->alignment = gtk_alignment_new (0.5, 0.5, 0, 0);
hildon_button_add_title_size_group (HildonButton *button,
GtkSizeGroup *size_group)
{
+ HildonButtonPrivate *priv;
+
g_return_if_fail (HILDON_IS_BUTTON (button));
g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
- gtk_size_group_add_widget (size_group, GTK_WIDGET (button->priv->title));
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ gtk_size_group_add_widget (size_group, GTK_WIDGET (priv->title));
}
/**
hildon_button_add_value_size_group (HildonButton *button,
GtkSizeGroup *size_group)
{
+ HildonButtonPrivate *priv;
+
g_return_if_fail (HILDON_IS_BUTTON (button));
g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
- gtk_size_group_add_widget (size_group, GTK_WIDGET (button->priv->value));
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ gtk_size_group_add_widget (size_group, GTK_WIDGET (priv->value));
}
/**
hildon_button_add_image_size_group (HildonButton *button,
GtkSizeGroup *size_group)
{
+ HildonButtonPrivate *priv;
+
g_return_if_fail (HILDON_IS_BUTTON (button));
g_return_if_fail (GTK_IS_SIZE_GROUP (size_group));
- g_return_if_fail (GTK_IS_WIDGET (button->priv->image));
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ g_return_if_fail (GTK_IS_WIDGET (priv->image));
- gtk_size_group_add_widget (size_group, GTK_WIDGET (button->priv->image));
+ gtk_size_group_add_widget (size_group, GTK_WIDGET (priv->image));
}
/**
hildon_button_set_arrangement (HildonButton *button,
HildonButtonArrangement arrangement)
{
- HildonButtonPrivate *priv = button->priv;
+ HildonButtonPrivate *priv;
+
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
/* Pack everything */
if (arrangement == HILDON_BUTTON_ARRANGEMENT_VERTICAL) {
g_return_if_fail (HILDON_IS_BUTTON (button));
- priv = button->priv;
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
gtk_label_set_text (priv->title, title);
/* If the button has no title, hide the label so the value is
g_return_if_fail (HILDON_IS_BUTTON (button));
- priv = button->priv;
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
gtk_label_set_text (priv->value, value);
/* If the button has no value, hide the label so the title is
const gchar *
hildon_button_get_title (HildonButton *button)
{
+ HildonButtonPrivate *priv;
+
g_return_val_if_fail (HILDON_IS_BUTTON (button), NULL);
- return gtk_label_get_text (button->priv->title);
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ return gtk_label_get_text (priv->title);
}
/**
const gchar *
hildon_button_get_value (HildonButton *button)
{
+ HildonButtonPrivate *priv;
+
g_return_val_if_fail (HILDON_IS_BUTTON (button), NULL);
- return gtk_label_get_text (button->priv->value);
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ return gtk_label_get_text (priv->value);
}
/**
g_return_if_fail (HILDON_IS_BUTTON (button));
g_return_if_fail (!image || GTK_IS_WIDGET (image));
- priv = button->priv;
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
/* Return if there's nothing to do */
if (image == priv->image)
GtkWidget *
hildon_button_get_image (HildonButton *button)
{
+ HildonButtonPrivate *priv;
+
g_return_val_if_fail (HILDON_IS_BUTTON (button), NULL);
- return button->priv->image;
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ return priv->image;
}
/**
hildon_button_set_image_position (HildonButton *button,
GtkPositionType position)
{
+ HildonButtonPrivate *priv;
+
g_return_if_fail (HILDON_IS_BUTTON (button));
g_return_if_fail (position == GTK_POS_LEFT || position == GTK_POS_RIGHT);
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
/* Return if there's nothing to do */
- if (button->priv->image_position == position)
+ if (priv->image_position == position)
return;
- button->priv->image_position = position;
+ priv->image_position = position;
hildon_button_construct_child (button);
}
gfloat xscale,
gfloat yscale)
{
+ HildonButtonPrivate *priv;
GtkWidget *child;
g_return_if_fail (HILDON_IS_BUTTON (button));
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
child = gtk_bin_get_child (GTK_BIN (button));
if (GTK_IS_ALIGNMENT (child)) {
gfloat xalign,
gfloat yalign)
{
+ HildonButtonPrivate *priv;
+
g_return_if_fail (HILDON_IS_BUTTON (button));
- gtk_misc_set_alignment (GTK_MISC (button->priv->title), xalign, yalign);
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ gtk_misc_set_alignment (GTK_MISC (priv->title), xalign, yalign);
}
/**
gfloat xalign,
gfloat yalign)
{
+ HildonButtonPrivate *priv;
+
g_return_if_fail (HILDON_IS_BUTTON (button));
- gtk_misc_set_alignment (GTK_MISC (button->priv->value), xalign, yalign);
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
+
+ gtk_misc_set_alignment (GTK_MISC (priv->value), xalign, yalign);
}
/**
g_return_if_fail (HILDON_IS_BUTTON (button));
- priv = button->priv;
+ priv = HILDON_BUTTON_GET_PRIVATE (button);
/* Return if there's nothing to do */
if (priv->image_xalign == xalign && priv->image_yalign == yalign)
static void
hildon_button_construct_child (HildonButton *button)
{
- HildonButtonPrivate *priv = button->priv;
+ HildonButtonPrivate *priv = HILDON_BUTTON_GET_PRIVATE (button);
GtkWidget *child;
gint image_spacing;
const gchar *title, *value;
typedef struct _HildonButtonClass HildonButtonClass;
-typedef struct _HildonButtonPrivate HildonButtonPrivate;
-
struct _HildonButtonClass
{
GtkButtonClass parent_class;
struct _HildonButton
{
GtkButton parent;
-
- /* private */
- HildonButtonPrivate *priv;
};
typedef enum {
(G_TYPE_INSTANCE_GET_PRIVATE ((obj), \
HILDON_TYPE_TEXT_VIEW, HildonTextViewPrivate));
+typedef struct _HildonTextViewPrivate HildonTextViewPrivate;
+
struct _HildonTextViewPrivate
{
GtkTextBuffer *main_buffer; /* Used to show the "real" contents */
static void
hildon_text_view_refresh_contents (GtkWidget *text_view)
{
- HildonTextViewPrivate *priv = HILDON_TEXT_VIEW (text_view)->priv;
+ HildonTextViewPrivate *priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
gint bufsize = gtk_text_buffer_get_char_count (priv->main_buffer);
if ((bufsize > 0) || GTK_WIDGET_HAS_FOCUS (text_view)) {
g_return_if_fail (HILDON_IS_TEXT_VIEW (text_view));
g_return_if_fail (GTK_IS_TEXT_BUFFER (buffer));
- priv = text_view->priv;
+ priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
/* If this is the same buffer, don't do anything */
if (buffer == priv->main_buffer)
GtkTextBuffer *
hildon_text_view_get_buffer (HildonTextView *text_view)
{
+ HildonTextViewPrivate *priv;
+
g_return_val_if_fail (HILDON_IS_TEXT_VIEW (text_view), NULL);
+ priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
+
/* Always return priv->main_buffer even if the placeholder is
* being displayed */
- return text_view->priv->main_buffer;
+ return priv->main_buffer;
}
/**
hildon_text_view_set_placeholder (HildonTextView *text_view,
const gchar *text)
{
+ HildonTextViewPrivate *priv;
+
g_return_if_fail (HILDON_IS_TEXT_VIEW (text_view) && text != NULL);
- gtk_text_buffer_set_text (text_view->priv->placeholder_buffer, text, -1);
+ priv = HILDON_TEXT_VIEW_GET_PRIVATE (text_view);
+
+ gtk_text_buffer_set_text (priv->placeholder_buffer, text, -1);
}
/**
static void
hildon_text_view_finalize (GObject *object)
{
- HildonTextViewPrivate *priv = HILDON_TEXT_VIEW (object)->priv;
+ HildonTextViewPrivate *priv = HILDON_TEXT_VIEW_GET_PRIVATE (object);
g_signal_handler_disconnect (priv->main_buffer, priv->changed_id);
g_object_unref (priv->main_buffer);
{
HildonTextViewPrivate *priv = HILDON_TEXT_VIEW_GET_PRIVATE (self);
- self->priv = priv;
-
priv->main_buffer = gtk_text_buffer_new (NULL);
priv->placeholder_buffer = gtk_text_buffer_new (NULL);
typedef struct _HildonTextViewClass HildonTextViewClass;
-typedef struct _HildonTextViewPrivate HildonTextViewPrivate;
-
struct _HildonTextViewClass
{
GtkTextViewClass parent_class;
struct _HildonTextView
{
GtkTextView parent;
-
- /* private */
- HildonTextViewPrivate *priv;
};
projects / hildon / commitdiff