← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.3.4 upstream)
  • mto: This revision was merged to the branch mainline in revision 204.
  • Revision ID: james.westby@ubuntu.com-20110530110449-ut1tc5t61rpvf9e3
Tags: upstream-3.0.2
Import upstream version 3.0.2

Show diffs side-by-side

added added

removed removed

Lines of Context:
gnome-panel/libpanel-applet-private/panel-applet-frame-dbus.c
158
158
panel_applet_frame_dbus_sync_menu_state (PanelAppletFrame *frame,
159
159
                                         gboolean          movable,
160
160
                                         gboolean          removable,
161
 
                                         gboolean          lockable,
162
 
                                         gboolean          locked,
163
161
                                         gboolean          locked_down)
164
162
{
165
163
        PanelAppletFrameDBus *dbus_frame = PANEL_APPLET_FRAME_DBUS (frame);
166
164
 
167
165
        panel_applet_container_child_set (dbus_frame->priv->container,
168
 
                                          "locked", g_variant_new_boolean (lockable && locked),
169
 
                                          NULL, NULL, NULL);
170
 
        panel_applet_container_child_set (dbus_frame->priv->container,
171
166
                                          "locked-down", g_variant_new_boolean (locked_down),
172
167
                                          NULL, NULL, NULL);
173
168
}
185
180
}
186
181
 
187
182
static void
 
183
panel_applet_frame_dbus_popup_edit_menu (PanelAppletFrame *frame,
 
184
                                         guint             button,
 
185
                                         guint32           timestamp)
 
186
{
 
187
        PanelAppletFrameDBus *dbus_frame = PANEL_APPLET_FRAME_DBUS (frame);
 
188
 
 
189
        panel_applet_container_child_popup_edit_menu (dbus_frame->priv->container,
 
190
                                                      button, timestamp,
 
191
                                                      NULL, NULL, NULL);
 
192
}
 
193
 
 
194
static void
188
195
change_orientation_cb (PanelAppletContainer *container,
189
196
                       GAsyncResult         *res,
190
197
                       PanelAppletFrame     *frame)
316
323
}
317
324
 
318
325
static void
319
 
panel_applet_frame_dbus_applet_lock (PanelAppletContainer *container,
320
 
                                     gboolean              locked,
321
 
                                     PanelAppletFrame     *frame)
322
 
{
323
 
        _panel_applet_frame_applet_lock (frame, locked);
324
 
}
325
 
 
326
 
static void
327
326
panel_applet_frame_dbus_finalize (GObject *object)
328
327
{
329
328
        PanelAppletFrameDBus *frame = PANEL_APPLET_FRAME_DBUS (object);
364
363
        g_signal_connect (container, "applet-move",
365
364
                          G_CALLBACK (panel_applet_frame_dbus_applet_move),
366
365
                          frame);
367
 
        g_signal_connect (container, "applet-lock",
368
 
                          G_CALLBACK (panel_applet_frame_dbus_applet_lock),
369
 
                          frame);
370
366
}
371
367
 
372
368
static void
380
376
        frame_class->init_properties = panel_applet_frame_dbus_init_properties;
381
377
        frame_class->sync_menu_state = panel_applet_frame_dbus_sync_menu_state;
382
378
        frame_class->popup_menu = panel_applet_frame_dbus_popup_menu;
 
379
        frame_class->popup_edit_menu = panel_applet_frame_dbus_popup_edit_menu;
383
380
        frame_class->change_orientation = panel_applet_frame_dbus_change_orientation;
384
381
        frame_class->change_size = panel_applet_frame_dbus_change_size;
385
382
        frame_class->change_background = panel_applet_frame_dbus_change_background;
411
408
        PanelAppletFrameDBus *dbus_frame;
412
409
        PanelAppletFrame     *frame;
413
410
        GVariantBuilder       builder;
 
411
        GdkScreen            *screen;
 
412
        gchar                *settings_path;
414
413
        gchar                *conf_path;
415
414
        gchar                *background;
416
415
        guint                 orient;
425
424
        frame = PANEL_APPLET_FRAME (dbus_frame);
426
425
        _panel_applet_frame_set_iid (frame, iid);
427
426
 
 
427
        screen = panel_applet_frame_activating_get_screen (frame_act);
428
428
        orient = get_panel_applet_orient (panel_applet_frame_activating_get_orientation (frame_act));
 
429
        settings_path = panel_applet_frame_activating_get_settings_path (frame_act);
429
430
        conf_path = panel_applet_frame_activating_get_conf_path (frame_act);
430
431
        /* we can't really get a background string at this point since we don't
431
432
         * know the position of the applet */
433
434
 
434
435
        g_variant_builder_init (&builder, G_VARIANT_TYPE ("a{sv}"));
435
436
        g_variant_builder_add (&builder, "{sv}",
 
437
                               "settings-path",
 
438
                               g_variant_new_string (settings_path));
 
439
        g_variant_builder_add (&builder, "{sv}",
436
440
                               "prefs-key",
437
441
                               g_variant_new_string (conf_path));
438
442
        g_variant_builder_add (&builder, "{sv}",
442
446
                               "size",
443
447
                               g_variant_new_uint32 (panel_applet_frame_activating_get_size (frame_act)));
444
448
        g_variant_builder_add (&builder, "{sv}",
445
 
                               "locked",
446
 
                               g_variant_new_boolean (panel_applet_frame_activating_get_locked (frame_act)));
447
 
        g_variant_builder_add (&builder, "{sv}",
448
449
                               "locked-down",
449
450
                               g_variant_new_boolean (panel_applet_frame_activating_get_locked_down (frame_act)));
450
451
        if (background) {
456
457
        g_object_set_data (G_OBJECT (frame), "panel-applet-frame-activating", frame_act);
457
458
 
458
459
        panel_applet_container_add (dbus_frame->priv->container,
459
 
                                    iid, NULL,
 
460
                                    screen, iid, NULL,
460
461
                                    (GAsyncReadyCallback) panel_applet_frame_dbus_activated,
461
462
                                    frame,
462
463
                                    g_variant_builder_end (&builder));
463
464
 
464
465
        g_free (conf_path);
 
466
        g_free (settings_path);
465
467
        g_free (background);
466
468
 
467
469
        return TRUE;