← Back to branch summary

~bratsche/xsplash/last-frame-for-0.7

« back to all changes in this revision

Viewing changes to src/xsplash.c

  • Committer: Cody Russell
  • Date: 2009-08-17 13:44:59 UTC
  • Revision ID: cody@beamish-20090817134459-12xw4rx4hrdesonb
logo image parameter

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/xsplash.c
66
66
 
67
67
static gboolean  gdm_session      = FALSE;
68
68
static gchar    *background_image = NULL;
 
69
static gchar    *logo_image       = NULL;
69
70
 
70
71
static GOptionEntry entries[] = {
71
72
  { "gdm-session", 'g', 0, G_OPTION_ARG_NONE, &gdm_session, "Run in gdm session", NULL },
72
73
  { "background", 'b', 0, G_OPTION_ARG_FILENAME, &background_image, "Filename for background image", NULL },
 
74
  { "logo", 'l', 0, G_OPTION_ARG_FILENAME, &logo_image, "Filename for logo image", NULL },
73
75
  { NULL }
74
76
};
75
77
 
293
295
 
294
296
  pixbuf = get_pixbuf (gdk_screen_get_width (screen),
295
297
                       gdk_screen_get_height (screen));
296
 
  logo = gdk_pixbuf_new_from_file ("/usr/share/images/C/ubuntuheader.png", NULL);
 
298
  logo = gdk_pixbuf_new_from_file (logo_image, NULL);
297
299
 
298
300
  fixed = gtk_fixed_new ();
299
301
 
465
467
  if (background_image == NULL)
466
468
    background_image = g_strdup ("/usr/share/backgrounds/warty-final-ubuntu.png");
467
469
 
 
470
  if (logo_image == NULL)
 
471
    logo_image = g_strdup ("/usr/share/images/C/ubuntuheader.png");
 
472
 
468
473
  system_bus = dbus_g_bus_get (DBUS_BUS_SYSTEM, NULL);
469
474
  bus_proxy = dbus_g_proxy_new_for_name (system_bus,
470
475
                                         DBUS_SERVICE_DBUS,
497
502
 
498
503
  gtk_main ();
499
504
 
 
505
  if (background_image != NULL)
 
506
    g_free (background_image);
 
507
 
 
508
  if (logo_image != NULL)
 
509
    g_free (logo_image);
 
510
 
500
511
  return 0;
501
512
}
502
513
 
528
539
        }
529
540
    }
530
541
 
531
 
  if (background_image != NULL)
532
 
    g_free (background_image);
533
 
 
534
542
  return TRUE;
535
543
}