← Back to branch summary

~ubuntu-branches/ubuntu/lucid/gnome-terminal/lucid-updates

« back to all changes in this revision

Viewing changes to src/eggsmclient.c

  • Committer: Bazaar Package Importer
  • Author(s): Didier Roche
  • Date: 2009-04-28 12:07:18 UTC
  • mfrom: (1.3.30 upstream)
  • Revision ID: james.westby@ubuntu.com-20090428120718-vfcpzs27egrtr0dy
Tags: 2.26.1-0ubuntu1
https://launchpad.net/bugs/361053
https://launchpad.net/bugs/333603
https://launchpad.net/bugs/331295
* New upstream release: (LP: #361053)
  - Make gnome-terminal session loading work (LP: #333603)
  - Missing translator comment
  - gnome terminal treats pixelsized fonts point sized
  - Use of uninitialized variables
  - gnome-terminal crashed with SIGSEGV in gtk_ui_manager_remove_ui()
  - Update to GNOME Help Centre OMF Files
  - Translation update
  - 'Close this terminal' warning labels button as 'Close Window'
    (LP: #331295)
* debian/control.in:
  - bump libgtk2.0-dev to 2.14.0
  - bump libvte-dev to 0.20.0
  - re-generate debian/control
* remove debian/patches/30_honour_point_pixel_sizes.patch, the change
  is in the tarball
* re-generate debian/patches/99_autoreconf.patch

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/eggsmclient.c
178
178
static gboolean sm_client_disable = FALSE;
179
179
static char *sm_client_state_file = NULL;
180
180
static char *sm_client_id = NULL;
 
181
static char *sm_config_prefix = NULL;
181
182
 
182
183
static gboolean
183
184
sm_client_post_parse_func (GOptionContext  *context,
228
229
    { "sm-client-id", 0, 0,
229
230
      G_OPTION_ARG_STRING, &sm_client_id,
230
231
      N_("Specify session management ID"), N_("ID") },
231
 
    /* Compatibility options */
 
232
    /* GnomeClient compatibility option */
232
233
    { "sm-disable", 0, G_OPTION_FLAG_HIDDEN,
233
234
      G_OPTION_ARG_NONE, &sm_client_disable,
234
235
      NULL, NULL },
 
236
    /* GnomeClient compatibility option. This is a dummy option that only
 
237
     * exists so that sessions saved by apps with GnomeClient can be restored
 
238
     * later when they've switched to EggSMClient. See bug #575308.
 
239
     */
 
240
    { "sm-config-prefix", 0, G_OPTION_FLAG_HIDDEN,
 
241
      G_OPTION_ARG_STRING, &sm_config_prefix,
 
242
      NULL, NULL },
235
243
    { NULL }
236
244
  };
237
245
  GOptionGroup *group;