← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnome-panel/raring

« back to all changes in this revision

Viewing changes to .pc/85_disable_shutdown_on_ltsp.patch/gnome-panel/panel-menu-items.c

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-05-25 10:44:35 UTC
  • mfrom: (2.1.17 sid)
  • Revision ID: package-import@ubuntu.com-20120525104435-icbp1ii5bg6tiial
Tags: 1:3.4.2.1-2ubuntu1
* Resynchronize with Debian. Remaining changes:
  - debian/control:
    + Recommend indicator-complete
    + Use epoch in breaks/replaces version
  - debian/patches/01_menus_rename.patch: Dropped, Debian-specific
  - debian/patches/40_unset_menuproxy.patch:
    + Make sure gnome-panel and the applets don't pick up menu proxies.
  - debian/patches/41_classic_layout.patch:
    + Change the defaults to be more "classic Ubuntu": Show indicators
      & show desktop, drop GNOME clock & notification area
  - debian/patches/85_disable_shutdown_on_ltsp.patch:
    + Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* Dropped extra intltool-update run from debian/rules; I don't think
  this is needed anymore

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/85_disable_shutdown_on_ltsp.patch/gnome-panel/panel-menu-items.c
46
46
 
47
47
#include <libpanel-util/panel-error.h>
48
48
#include <libpanel-util/panel-glib.h>
 
49
#include <libpanel-util/panel-gtk.h>
49
50
#include <libpanel-util/panel-keyfile.h>
50
51
#include <libpanel-util/panel-launch.h>
51
52
#include <libpanel-util/panel-session-manager.h>
62
63
#include "panel-stock-icons.h"
63
64
#include "panel-util.h"
64
65
 
65
 
#define BOOKMARKS_FILENAME      ".gtk-bookmarks"
66
66
#define DESKTOP_IS_HOME_DIR_DIR "/apps/nautilus/preferences"
67
67
#define DESKTOP_IS_HOME_DIR_KEY "/apps/nautilus/preferences/desktop_is_home_dir"
68
68
#define NAMES_DIR               "/apps/nautilus/desktop"
516
516
        GSList      *add_bookmarks, *l;
517
517
        PanelBookmark *bookmark;
518
518
 
519
 
        filename = g_build_filename (g_get_home_dir (),
520
 
                                     BOOKMARKS_FILENAME, NULL);
 
519
        filename = panel_gtk_get_bookmark_file ();
521
520
 
522
521
        io_channel = g_io_channel_new_file (filename, "r", NULL);
523
522
        g_free (filename);
1378
1377
                add_menu_separator (desktop_menu);
1379
1378
#endif
1380
1379
 
1381
 
        item = panel_menu_item_desktop_new ("gnome-online-accounts-panel.desktop",
1382
 
                                            NULL, FALSE);
1383
 
        if (item)
1384
 
                gtk_menu_shell_append (GTK_MENU_SHELL (desktop_menu), item);
1385
 
 
1386
1380
        /* Do not force the string like in gnome-shell, but just use the one
1387
1381
         * from the .desktop file */
1388
1382
        item = panel_menu_item_desktop_new ("gnome-control-center.desktop",
1518
1512
 
1519
1513
        menuitem->priv->recent_manager = gtk_recent_manager_get_default ();
1520
1514
 
1521
 
        bookmarks_filename = g_build_filename (g_get_home_dir (),
1522
 
                                               BOOKMARKS_FILENAME, NULL);
 
1515
        bookmarks_filename = panel_gtk_get_bookmark_file ();
1523
1516
        bookmark = g_file_new_for_path (bookmarks_filename);
1524
1517
 
1525
1518
        error = NULL;