← Back to branch summary

~ubuntu-branches/ubuntu/precise/evolution/precise

« back to all changes in this revision

Viewing changes to shell/e-shell-window-private.c

  • Committer: Bazaar Package Importer
  • Author(s): Mathieu Trudel-Lapierre
  • Date: 2011-06-24 00:27:53 UTC
  • mfrom: (1.1.80 upstream)
  • Revision ID: james.westby@ubuntu.com-20110624002753-2vh1vjavlya7r103
Tags: 3.1.2-0ubuntu1
* New upstream release 3.1.2.
* debian/control: adjust Build-Depends to match new upstream requirements for
  the new release.
* debian/control: update evolution and evolution-dev Depends to require the
  right versions of e-d-s (>= 3.1, << 3.2), and drop libunique-3.0-dev.
* debian/control,
  debian/evolution.install: remove groupwise-features from the plugin list,
  it's now split out into a separate module.
* debian/patches/03_lpi.patch: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shell/e-shell-window-private.c
19
19
 *
20
20
 */
21
21
 
 
22
#ifdef HAVE_CONFIG_H
 
23
#include <config.h>
 
24
#endif
 
25
 
22
26
#include "e-shell-window-private.h"
23
27
 
24
28
static void
261
265
e_shell_window_private_constructed (EShellWindow *shell_window)
262
266
{
263
267
        EShellWindowPrivate *priv = shell_window->priv;
264
 
#if 0
265
 
        EShellSettings *shell_settings;
266
 
#endif
267
268
        EShell *shell;
268
269
        GConfBridge *bridge;
269
270
        GtkAction *action;
270
271
        GtkAccelGroup *accel_group;
271
 
#if 0
272
 
        GtkActionGroup *action_group;
273
 
#endif
274
272
        GtkUIManager *ui_manager;
275
273
        GtkBox *box;
276
274
        GtkPaned *paned;
281
279
        const gchar *key;
282
280
        const gchar *id;
283
281
 
 
282
#ifndef G_OS_WIN32
 
283
        GSettings *settings;
 
284
        GtkActionGroup *action_group;
 
285
#endif
 
286
 
284
287
        window = GTK_WINDOW (shell_window);
285
288
 
286
289
        shell = e_shell_window_get_shell (shell_window);
287
 
#if 0
288
 
        shell_settings = e_shell_get_shell_settings (shell);
289
 
#endif
290
290
 
291
291
        ui_manager = e_shell_window_get_ui_manager (shell_window);
292
292
        e_shell_configure_ui_manager (shell, E_UI_MANAGER (ui_manager));
362
362
                shell_window, "notify::active-view",
363
363
                G_CALLBACK (e_shell_window_update_search_menu), NULL);
364
364
 
365
 
#if 0  /* XXX Lockdown keys have moved to gsettings-desktop-schemas,
366
 
        *     so disable lockdown integration until we're ready for
367
 
        *     GSettings. */
368
365
#ifndef G_OS_WIN32
369
366
        /* Support lockdown. */
370
367
 
 
368
        settings = g_settings_new ("org.gnome.desktop.lockdown");
 
369
 
371
370
        action_group = ACTION_GROUP (LOCKDOWN_PRINTING);
372
371
 
373
 
        g_object_bind_property (
374
 
                shell_settings, "disable-printing",
 
372
        g_settings_bind (
 
373
                settings, "disable-printing",
375
374
                action_group, "visible",
376
 
                G_BINDING_SYNC_CREATE |
377
 
                G_BINDING_INVERT_BOOLEAN);
 
375
                G_SETTINGS_BIND_GET |
 
376
                G_SETTINGS_BIND_INVERT_BOOLEAN);
378
377
 
379
378
        action_group = ACTION_GROUP (LOCKDOWN_PRINT_SETUP);
380
379
 
381
 
        g_object_bind_property (
382
 
                shell_settings, "disable-print-setup",
 
380
        g_settings_bind (
 
381
                settings, "disable-print-setup",
383
382
                action_group, "visible",
384
 
                G_BINDING_SYNC_CREATE |
385
 
                G_BINDING_INVERT_BOOLEAN);
 
383
                G_SETTINGS_BIND_GET |
 
384
                G_SETTINGS_BIND_INVERT_BOOLEAN);
386
385
 
387
386
        action_group = ACTION_GROUP (LOCKDOWN_SAVE_TO_DISK);
388
387
 
389
 
        g_object_bind_property (
390
 
                shell_settings, "disable-save-to-disk",
 
388
        g_settings_bind (
 
389
                settings, "disable-save-to-disk",
391
390
                action_group, "visible",
392
 
                G_BINDING_SYNC_CREATE |
393
 
                G_BINDING_INVERT_BOOLEAN);
 
391
                G_SETTINGS_BIND_GET |
 
392
                G_SETTINGS_BIND_INVERT_BOOLEAN);
 
393
 
 
394
        g_object_unref (settings);
394
395
#endif /* G_OS_WIN32 */
395
 
#endif
396
396
 
397
397
        /* Bind GObject properties to GObject properties. */
398
398