← Back to branch summary

~ubuntu-branches/ubuntu/intrepid/pidgin/intrepid-proposed

« back to all changes in this revision

Viewing changes to pidgin/gtkmenutray.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2008-10-22 21:51:41 UTC
  • mfrom: (1.1.14 upstream)
  • Revision ID: james.westby@ubuntu.com-20081022215141-ps1xypyvtql9kqwa
Tags: 1:2.5.2-0ubuntu1
* New upstream version
* debian/patches/06_ssl_null_pointer_deref.patch:
  - the change is in the new version

Show diffs side-by-side

added added

removed removed

Lines of Context:
pidgin/gtkmenutray.c
84
84
}
85
85
 
86
86
static void
 
87
pidgin_menu_tray_map(GtkWidget *widget)
 
88
{
 
89
        GTK_WIDGET_CLASS(parent_class)->map(widget);
 
90
        gtk_container_add(GTK_CONTAINER(widget),
 
91
                        PIDGIN_MENU_TRAY(widget)->tray);
 
92
}
 
93
 
 
94
static void
87
95
pidgin_menu_tray_finalize(GObject *obj)
88
96
{
89
97
        PidginMenuTray *tray = PIDGIN_MENU_TRAY(obj);
109
117
pidgin_menu_tray_class_init(PidginMenuTrayClass *klass) {
110
118
        GObjectClass *object_class = G_OBJECT_CLASS(klass);
111
119
        GtkItemClass *item_class = GTK_ITEM_CLASS(klass);
 
120
        GtkWidgetClass *widget_class = GTK_WIDGET_CLASS(klass);
112
121
        GParamSpec *pspec;
113
122
 
114
123
        parent_class = g_type_class_peek_parent(klass);
119
128
        item_class->select = pidgin_menu_tray_select;
120
129
        item_class->deselect = pidgin_menu_tray_deselect;
121
130
 
 
131
        widget_class->map = pidgin_menu_tray_map;
 
132
 
122
133
        pspec = g_param_spec_object("box", "The box",
123
134
                                                                "The box",
124
135
                                                                GTK_TYPE_BOX,
152
163
                gtk_widget_set_size_request(widget, -1, height);
153
164
        }
154
165
 
155
 
        gtk_container_add(GTK_CONTAINER(menu_tray), menu_tray->tray);
156
 
 
157
166
        gtk_widget_show(menu_tray->tray);
158
167
}
159
168