Mercurial > pidgin
diff src/gtkmenutray.c @ 11558:19941a47405c
[gaim-migrate @ 13820]
Compiles against GTK < 2.4
committer: Tailor Script <tailor@pidgin.im>
author | Sean Egan <seanegan@gmail.com> |
---|---|
date | Tue, 20 Sep 2005 22:08:40 +0000 |
parents | 5c8210f7cbe2 |
children | 767e3c0c5062 |
line wrap: on
line diff
--- a/src/gtkmenutray.c Tue Sep 20 21:47:57 2005 +0000 +++ b/src/gtkmenutray.c Tue Sep 20 22:08:40 2005 +0000 @@ -19,16 +19,6 @@ */ #include "gtkmenutray.h" -#define GAIM_GTK_MENU_TRAY_GET_PRIVATE(obj) \ - (G_TYPE_INSTANCE_GET_PRIVATE((obj), GAIM_GTK_TYPE_MENU_TRAY, GaimGtkMenuTrayPriv)) - -/****************************************************************************** - * Structs - *****************************************************************************/ -typedef struct { - GtkWidget *tray; -} GaimGtkMenuTrayPriv; - /****************************************************************************** * Enums *****************************************************************************/ @@ -89,10 +79,9 @@ static void gaim_gtk_menu_tray_finalize(GObject *obj) { - GaimGtkMenuTrayPriv *priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(obj); - - if(GTK_IS_WIDGET(priv->tray)) - gtk_widget_destroy(GTK_WIDGET(priv->tray)); + GaimGtkMenuTray *tray = GAIM_GTK_MENU_TRAY(obj); + if(GTK_IS_WIDGET(tray->tray)) + gtk_widget_destroy(GTK_WIDGET(tray->tray)); G_OBJECT_CLASS(parent_class)->finalize(obj); } @@ -111,8 +100,6 @@ item_class->select = gaim_gtk_menu_tray_select; item_class->deselect = gaim_gtk_menu_tray_deselect; - g_type_class_add_private(klass, sizeof(GaimGtkMenuTrayPriv)); - pspec = g_param_spec_object("box", "The box", "The box", GTK_TYPE_BOX, @@ -122,16 +109,14 @@ static void gaim_gtk_menu_tray_init(GaimGtkMenuTray *menu_tray) { - GaimGtkMenuTrayPriv *priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); - gtk_menu_item_set_right_justified(GTK_MENU_ITEM(menu_tray), TRUE); - if(!GTK_IS_WIDGET(priv->tray)) - priv->tray = gtk_hbox_new(FALSE, 0); + if(!GTK_IS_WIDGET(menu_tray->tray)) + menu_tray->tray = gtk_hbox_new(FALSE, 0); - gtk_container_add(GTK_CONTAINER(menu_tray), priv->tray); + gtk_container_add(GTK_CONTAINER(menu_tray), menu_tray->tray); - gtk_widget_show(priv->tray); + gtk_widget_show(menu_tray->tray); } /****************************************************************************** @@ -170,35 +155,22 @@ GtkWidget * gaim_gtk_menu_tray_get_box(GaimGtkMenuTray *menu_tray) { - GaimGtkMenuTrayPriv *priv; - g_return_val_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray), NULL); - - priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); - - return priv->tray; + return menu_tray->tray; } void gaim_gtk_menu_tray_append(GaimGtkMenuTray *menu_tray, GtkWidget *widget) { - GaimGtkMenuTrayPriv *priv; - g_return_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray)); g_return_if_fail(GTK_IS_WIDGET(widget)); - priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); - - gtk_box_pack_end(GTK_BOX(priv->tray), widget, FALSE, FALSE, 0); + gtk_box_pack_end(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0); } void gaim_gtk_menu_tray_prepend(GaimGtkMenuTray *menu_tray, GtkWidget *widget) { - GaimGtkMenuTrayPriv *priv; - g_return_if_fail(GAIM_GTK_IS_MENU_TRAY(menu_tray)); g_return_if_fail(GTK_IS_WIDGET(widget)); - priv = GAIM_GTK_MENU_TRAY_GET_PRIVATE(menu_tray); - - gtk_box_pack_start(GTK_BOX(priv->tray), widget, FALSE, FALSE, 0); + gtk_box_pack_start(GTK_BOX(menu_tray->tray), widget, FALSE, FALSE, 0); }