Fixed includes
This commit is contained in:
parent
12e59092ac
commit
54d30725f8
|
@ -17,13 +17,13 @@
|
||||||
#include <gtksourceview/gtksourcelanguagesmanager.h>
|
#include <gtksourceview/gtksourcelanguagesmanager.h>
|
||||||
#include <gtksourceview/gtksourcetag.h>
|
#include <gtksourceview/gtksourcetag.h>
|
||||||
|
|
||||||
#include "../gm-app.h"
|
#include "gm-app.h"
|
||||||
#include "gm-preferences-dialog.h"
|
#include "gm-preferences-dialog.h"
|
||||||
#include "../widgets/gm-editor-view.h"
|
#include "widgets/gm-editor-view.h"
|
||||||
#include "../gm-support.h"
|
#include "gm-support.h"
|
||||||
#include "../gm-debug.h"
|
#include "gm-debug.h"
|
||||||
#include "../gm-options.h"
|
#include "gm-options.h"
|
||||||
#include "../gm-color-table.h"
|
#include "gm-color-table.h"
|
||||||
|
|
||||||
void gm_preferences_dialog_run_dialog();
|
void gm_preferences_dialog_run_dialog();
|
||||||
|
|
||||||
|
@ -143,7 +143,7 @@ gm_preferences_dialog_init_combo_box_scheme() {
|
||||||
|
|
||||||
while (color_schemes[i].key != NULL) {
|
while (color_schemes[i].key != NULL) {
|
||||||
gtk_list_store_append(store, &iter);
|
gtk_list_store_append(store, &iter);
|
||||||
gtk_list_store_set(store, &iter, SCHEME_NAME, color_schemes[i].key,
|
gtk_list_store_set(store, &iter, SCHEME_NAME, _(color_schemes[i].key),
|
||||||
SCHEME_OPTION, color_schemes[i].value, -1);
|
SCHEME_OPTION, color_schemes[i].value, -1);
|
||||||
|
|
||||||
if (scheme != NULL && strcasecmp(scheme, color_schemes[i].value) == 0) {
|
if (scheme != NULL && strcasecmp(scheme, color_schemes[i].value) == 0) {
|
||||||
|
@ -153,7 +153,7 @@ gm_preferences_dialog_init_combo_box_scheme() {
|
||||||
++i;
|
++i;
|
||||||
}
|
}
|
||||||
|
|
||||||
preferences->user_scheme_index = i;
|
preferences->user_scheme_index = i - 1;
|
||||||
gtk_combo_box_set_active(box, select);
|
gtk_combo_box_set_active(box, select);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -485,6 +485,7 @@ on_gm_preferences_dialog_color_set(GtkColorButton *button, gchar *option) {
|
||||||
|
|
||||||
box = GTK_COMBO_BOX(gm_preferences_dialog_widget(
|
box = GTK_COMBO_BOX(gm_preferences_dialog_widget(
|
||||||
"combo_box_scheme"));
|
"combo_box_scheme"));
|
||||||
|
|
||||||
g_signal_handlers_block_by_func(box,
|
g_signal_handlers_block_by_func(box,
|
||||||
on_gm_preferences_dialog_combo_box_scheme_changed, NULL);
|
on_gm_preferences_dialog_combo_box_scheme_changed, NULL);
|
||||||
|
|
||||||
|
|
|
@ -18,13 +18,13 @@
|
||||||
#include <libgnomevfs/gnome-vfs.h>
|
#include <libgnomevfs/gnome-vfs.h>
|
||||||
#include <glade/glade.h>
|
#include <glade/glade.h>
|
||||||
|
|
||||||
#include "../gm-scripts.h"
|
#include "gm-scripts.h"
|
||||||
#include "../gm-world.h"
|
#include "gm-world.h"
|
||||||
#include "../gm-debug.h"
|
#include "gm-debug.h"
|
||||||
#include "../gm-app.h"
|
#include "gm-app.h"
|
||||||
#include "../gm-support.h"
|
#include "gm-support.h"
|
||||||
#include "../widgets/gm-app-view.h"
|
#include "widgets/gm-app-view.h"
|
||||||
#include "../widgets/gm-text-scroller.h"
|
#include "widgets/gm-text-scroller.h"
|
||||||
|
|
||||||
#define SCRIPT_TEMPLATE \
|
#define SCRIPT_TEMPLATE \
|
||||||
_("=begin\n" \
|
_("=begin\n" \
|
||||||
|
|
|
@ -7,8 +7,8 @@
|
||||||
|
|
||||||
#ifdef HAVE_RUBY
|
#ifdef HAVE_RUBY
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include "../gm-world.h"
|
#include "gm-world.h"
|
||||||
#include "../widgets/gm-app-view.h"
|
#include "widgets/gm-app-view.h"
|
||||||
|
|
||||||
void gm_scripts_dialog_run(GmAppView *view);
|
void gm_scripts_dialog_run(GmAppView *view);
|
||||||
void gm_scripts_dialog_init();
|
void gm_scripts_dialog_init();
|
||||||
|
|
|
@ -13,13 +13,13 @@
|
||||||
#include <libgnomeui/libgnomeui.h>
|
#include <libgnomeui/libgnomeui.h>
|
||||||
#include <glade/glade.h>
|
#include <glade/glade.h>
|
||||||
|
|
||||||
#include "../gm-support.h"
|
#include "gm-support.h"
|
||||||
|
|
||||||
#include "../gm-debug.h"
|
#include "gm-debug.h"
|
||||||
#include "gm-triggers-dialog.h"
|
#include "gm-triggers-dialog.h"
|
||||||
#include "../gm-app.h"
|
#include "gm-app.h"
|
||||||
#include "../gm-pixbuf.h"
|
#include "gm-pixbuf.h"
|
||||||
#include "../gm-scripts.h"
|
#include "gm-scripts.h"
|
||||||
|
|
||||||
typedef struct _GmTriggersDialog {
|
typedef struct _GmTriggersDialog {
|
||||||
GtkWidget *dialog;
|
GtkWidget *dialog;
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
#ifndef __GM_TRIGGERS_DIALOG__
|
#ifndef __GM_TRIGGERS_DIALOG__
|
||||||
#define __GM_TRIGGERS_DIALOG__
|
#define __GM_TRIGGERS_DIALOG__
|
||||||
|
|
||||||
#include "../gm-triggers.h"
|
#include "gm-triggers.h"
|
||||||
#include "../gm-world.h"
|
#include "gm-world.h"
|
||||||
|
|
||||||
GmTrigger *gm_triggers_dialog_run(GmWorld *world, GmTrigger *trig);
|
GmTrigger *gm_triggers_dialog_run(GmWorld *world, GmTrigger *trig);
|
||||||
GmTrigger *gm_triggers_dialog_run_new(GmWorld *world, GmTrigger *trig);
|
GmTrigger *gm_triggers_dialog_run_new(GmWorld *world, GmTrigger *trig);
|
||||||
|
|
|
@ -7,9 +7,9 @@
|
||||||
#include <libgnome/libgnome.h>
|
#include <libgnome/libgnome.h>
|
||||||
|
|
||||||
#include "gm-world-info-dialog.h"
|
#include "gm-world-info-dialog.h"
|
||||||
#include "../gm-world.h"
|
#include "gm-world.h"
|
||||||
#include "../gm-support.h"
|
#include "gm-support.h"
|
||||||
#include "../gm-pixbuf.h"
|
#include "gm-pixbuf.h"
|
||||||
|
|
||||||
#define G_WORLD_INFO_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-info.glade"
|
#define G_WORLD_INFO_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-info.glade"
|
||||||
|
|
||||||
|
|
|
@ -4,8 +4,8 @@
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include <glade/glade.h>
|
#include <glade/glade.h>
|
||||||
#include "../gm-world.h"
|
#include "gm-world.h"
|
||||||
#include "../gm-support.h"
|
#include "gm-support.h"
|
||||||
|
|
||||||
#define G_WORLD_LOGS_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-logs.glade"
|
#define G_WORLD_LOGS_XML PACKAGE_DATA_DIR "/" PACKAGE "/ui/gm-world-logs.glade"
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
#define __GM_WORLD_LOGS_DIALOG_H__
|
#define __GM_WORLD_LOGS_DIALOG_H__
|
||||||
|
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include "../gm-world.h"
|
#include "gm-world.h"
|
||||||
|
|
||||||
GtkDialog *gm_world_logs_dialog_new(GmWorld *world, GtkTreeView **view);
|
GtkDialog *gm_world_logs_dialog_new(GmWorld *world, GtkTreeView **view);
|
||||||
|
|
||||||
|
|
|
@ -14,12 +14,12 @@
|
||||||
|
|
||||||
#include "gm-world-properties-dialog.h"
|
#include "gm-world-properties-dialog.h"
|
||||||
#include "gm-triggers-dialog.h"
|
#include "gm-triggers-dialog.h"
|
||||||
#include "../gm-triggers.h"
|
#include "gm-triggers.h"
|
||||||
#include "../gm-support.h"
|
#include "gm-support.h"
|
||||||
#include "../gm-app.h"
|
#include "gm-app.h"
|
||||||
#include "../gm-debug.h"
|
#include "gm-debug.h"
|
||||||
#include "../gm-options.h"
|
#include "gm-options.h"
|
||||||
#include "../gm-pixbuf.h"
|
#include "gm-pixbuf.h"
|
||||||
|
|
||||||
typedef struct _GmWorldPropertiesDialog {
|
typedef struct _GmWorldPropertiesDialog {
|
||||||
GtkWidget *dialog;
|
GtkWidget *dialog;
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include <glade/glade.h>
|
#include <glade/glade.h>
|
||||||
|
|
||||||
#include "../gm-world.h"
|
#include "gm-world.h"
|
||||||
|
|
||||||
typedef struct _encoding {
|
typedef struct _encoding {
|
||||||
const gchar *charset;
|
const gchar *charset;
|
||||||
|
|
|
@ -12,12 +12,12 @@
|
||||||
#include <gtk/gtk.h>
|
#include <gtk/gtk.h>
|
||||||
#include <libgnomeui/libgnomeui.h>
|
#include <libgnomeui/libgnomeui.h>
|
||||||
|
|
||||||
#include "../gm-support.h"
|
#include "gm-support.h"
|
||||||
#include "../gm-debug.h"
|
#include "gm-debug.h"
|
||||||
#include "../gm-app.h"
|
#include "gm-app.h"
|
||||||
#include "gm-worlds-list-dialog.h"
|
#include "gm-worlds-list-dialog.h"
|
||||||
#include "gm-world-properties-dialog.h"
|
#include "gm-world-properties-dialog.h"
|
||||||
#include "../gm-pixbuf.h"
|
#include "gm-pixbuf.h"
|
||||||
|
|
||||||
typedef struct _GmWorldsListDialog {
|
typedef struct _GmWorldsListDialog {
|
||||||
GladeXML *xml;
|
GladeXML *xml;
|
||||||
|
|
Reference in New Issue