Commit 64467d7f authored by William Jon McCann's avatar William Jon McCann Committed by Bastien Nocera

shell: Make the application a GtkApplication subclass

This promotes better encapsulation and allows us to move
application logic out of main() and rename the confusingly
named control-center.c to main.c

https://bugzilla.gnome.org/show_bug.cgi?id=692174
parent 59f873ec
......@@ -22,7 +22,9 @@ BUILT_SOURCES = \
gnome_control_center_SOURCES = \
$(BUILT_SOURCES) \
control-center.c \
main.c \
cc-application.c \
cc-application.h \
cc-shell-log.c \
cc-shell-log.h \
gnome-control-center.c \
......
/*
* Copyright © 2013 Red Hat, Inc.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
* 02110-1301, USA.
*/
#ifndef CC_APPLICATION_H
#define CC_APPLICATION_H
#include <gtk/gtk.h>
G_BEGIN_DECLS
#define CC_TYPE_APPLICATION (cc_application_get_type ())
#define CC_APPLICATION(obj) \
(G_TYPE_CHECK_INSTANCE_CAST ((obj), \
CC_TYPE_APPLICATION, CcApplication))
#define CC_APPLICATION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_CAST ((klass), \
CC_TYPE_APPLICATION, CcApplicationClass))
#define CC_IS_APPLICATION(obj) \
(G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
CC_TYPE_APPLICATION))
#define CC_IS_APPLICATION_CLASS(klass) \
(G_TYPE_CHECK_CLASS_TYPE ((klass), \
CC_TYPE_APPLICATION))
#define CC_APPLICATION_GET_CLASS(obj) \
(G_TYPE_INSTANCE_GET_CLASS ((obj), \
CC_TYPE_APPLICATION, CcApplicationClass))
typedef struct _CcApplication CcApplication;
typedef struct _CcApplicationClass CcApplicationClass;
typedef struct _CcApplicationPrivate CcApplicationPrivate;
struct _CcApplication
{
GtkApplication parent_instance;
CcApplicationPrivate *priv;
};
struct _CcApplicationClass
{
GtkApplicationClass parent_class;
};
GType cc_application_get_type (void) G_GNUC_CONST;
GtkApplication *cc_application_new (void);
G_END_DECLS
#endif /* CC_APPLICATION_H */
......@@ -32,10 +32,6 @@
#include <string.h>
#include <libgd/gd-styled-text-renderer.h>
#ifdef HAVE_CHEESE
#include <clutter-gtk/clutter-gtk.h>
#endif /* HAVE_CHEESE */
#include "cc-panel.h"
#include "cc-shell.h"
#include "cc-shell-category-view.h"
......
/*
* Copyright (c) 2009, 2010 Intel, Inc.
* Copyright (c) 2010 Red Hat, Inc.
*
* The Control Center is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by the
* Free Software Foundation; either version 2 of the License, or (at your
* option) any later version.
*
* The Control Center is distributed in the hope that it will be useful, but
* WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
* or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details.
*
* You should have received a copy of the GNU General Public License along
* with the Control Center; if not, write to the Free Software Foundation,
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
* Author: Thomas Wood <thos@gnome.org>
*/
#include "config.h"
#include <stdlib.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
#include <egg-list-box.h>
#ifdef GDK_WINDOWING_X11
#include <X11/Xlib.h>
#endif
#include "cc-application.h"
int
main (int argc, char **argv)
{
GtkApplication *application;
int status;
bindtextdomain (GETTEXT_PACKAGE, GNOMELOCALEDIR);
bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8");
textdomain (GETTEXT_PACKAGE);
#ifdef GDK_WINDOWING_X11
XInitThreads ();
#endif
g_type_ensure (egg_list_box_get_type ());
application = cc_application_new ();
status = g_application_run (G_APPLICATION (application), argc, argv);
g_object_unref (application);
return status;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment