← Back to branch summary

~ubuntu-branches/ubuntu/utopic/xfce4-panel/utopic-proposed

« back to all changes in this revision

Viewing changes to panel/main.c

  • Committer: Package Import Robot
  • Author(s): Lionel Le Folgoc
  • Date: 2011-09-22 20:49:42 UTC
  • mfrom: (1.1.34 upstream)
  • Revision ID: package-import@ubuntu.com-20110922204942-i4ajy71ldiq17sz2
Tags: 4.8.6-0ubuntu1
https://launchpad.net/bugs/747137
* Upload pkg-xfce trunk (r6047) to oneiric, remaining Ubuntu changes:
  - debian/patches:
    + xubuntu_support-multiple-vendor-default-configs.patch: search for
      the default.xml default config in XDG_CONFIG_DIRS as well, and do
      not display the chooser dialog in this case. lp: #747137
    + series: refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
panel/main.c
58
58
static gboolean   opt_restart = FALSE;
59
59
static gboolean   opt_quit = FALSE;
60
60
static gboolean   opt_version = FALSE;
 
61
static gboolean   opt_disable_wm_check = FALSE;
61
62
static gchar     *opt_plugin_event = NULL;
62
63
static gchar    **opt_arguments = NULL;
63
64
static gboolean   sm_client_saved_state = FALSE;
81
82
  { "add", '\0', 0, G_OPTION_ARG_STRING, &opt_add, N_("Add a new plugin to the panel"), N_("PLUGIN-NAME") },
82
83
  { "restart", 'r', 0, G_OPTION_ARG_NONE, &opt_restart, N_("Restart the running panel instance"), NULL },
83
84
  { "quit", 'q', 0, G_OPTION_ARG_NONE, &opt_quit, N_("Quit the running panel instance"), NULL },
 
85
  { "disable-wm-check", 'd', 0, G_OPTION_ARG_NONE, &opt_disable_wm_check, N_("Do not wait for a window manager on startup"), NULL },
84
86
  { "version", 'V', 0, G_OPTION_ARG_NONE, &opt_version, N_("Print version information and exit"), NULL },
85
87
  { "plugin-event", '\0', G_OPTION_FLAG_HIDDEN, G_OPTION_ARG_STRING, &opt_plugin_event, NULL, NULL },
86
88
  { G_OPTION_REMAINING, '\0', 0, G_OPTION_ARG_STRING_ARRAY, &opt_arguments, NULL, NULL },
345
347
    signal (signums[i], panel_signal_handler);
346
348
 
347
349
  application = panel_application_get ();
 
350
  panel_application_load (application, opt_disable_wm_check);
348
351
 
349
352
  /* save the state before the quit signal if we can, this is a bit safer */
350
353
  g_signal_connect (G_OBJECT (sm_client), "save-state",