Compilation fixes
This commit is contained in:
parent
ab0bce68b1
commit
49364fc5f1
2 changed files with 5 additions and 4 deletions
|
@ -205,8 +205,9 @@ capplet_activate (Capplet *capplet)
|
||||||
#ifdef HAVE_BONOBO
|
#ifdef HAVE_BONOBO
|
||||||
if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc")))
|
if (!strncmp (entry->exec[0], "gnomecc", strlen ("gnomecc")))
|
||||||
capplet_control_launch (entry->exec[2], entry->name);
|
capplet_control_launch (entry->exec[2], entry->name);
|
||||||
|
else
|
||||||
#endif
|
#endif
|
||||||
else if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager")))
|
if (!strncmp (entry->exec[0], "root-manager", strlen ("root-manager")))
|
||||||
start_capplet_through_root_manager (entry);
|
start_capplet_through_root_manager (entry);
|
||||||
else
|
else
|
||||||
gnome_desktop_entry_launch (entry);
|
gnome_desktop_entry_launch (entry);
|
||||||
|
|
|
@ -62,6 +62,9 @@ main (int argc, char **argv)
|
||||||
{
|
{
|
||||||
CORBA_ORB orb;
|
CORBA_ORB orb;
|
||||||
|
|
||||||
|
CappletDirEntry *entry;
|
||||||
|
CappletDir *dir;
|
||||||
|
|
||||||
static gchar *capplet = NULL;
|
static gchar *capplet = NULL;
|
||||||
static struct poptOption gnomecc_options[] = {
|
static struct poptOption gnomecc_options[] = {
|
||||||
#ifdef HAVE_BONOBO
|
#ifdef HAVE_BONOBO
|
||||||
|
@ -89,9 +92,6 @@ main (int argc, char **argv)
|
||||||
#ifdef HAVE_BONOBO
|
#ifdef HAVE_BONOBO
|
||||||
if (capplet == NULL) {
|
if (capplet == NULL) {
|
||||||
#endif
|
#endif
|
||||||
CappletDirEntry *entry;
|
|
||||||
CappletDir *dir;
|
|
||||||
|
|
||||||
gnomecc_init ();
|
gnomecc_init ();
|
||||||
dir = get_root_capplet_dir ();
|
dir = get_root_capplet_dir ();
|
||||||
if (!dir)
|
if (!dir)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue