diff options
-rw-r--r-- | src/glibext/Makefile.am | 6 | ||||
-rw-r--r-- | src/glibext/_signal.h (renamed from src/glibext/signal.h) | 0 | ||||
-rw-r--r-- | src/glibext/displayoptions.c (renamed from src/glibext/gdisplayoptions.c) | 0 | ||||
-rw-r--r-- | src/glibext/displayoptions.h (renamed from src/glibext/gdisplayoptions.h) | 0 | ||||
-rw-r--r-- | src/glibext/linetoken.c (renamed from src/glibext/linesegment.c) | 0 | ||||
-rw-r--r-- | src/glibext/linetoken.h (renamed from src/glibext/linesegment.h) | 0 | ||||
-rw-r--r-- | src/glibext/tokenstyle.c (renamed from src/gtkext/rendering.c) | 0 | ||||
-rw-r--r-- | src/glibext/tokenstyle.h (renamed from src/gtkext/rendering.h) | 0 | ||||
-rw-r--r-- | src/gtkext/Makefile.am | 7 | ||||
-rw-r--r-- | src/gtkext/contentview-int.h (renamed from src/gtkext/gtkdisplaypanel-int.h) | 0 | ||||
-rw-r--r-- | src/gtkext/contentview.c (renamed from src/gtkext/gtkdisplaypanel.c) | 0 | ||||
-rw-r--r-- | src/gtkext/contentview.h (renamed from src/gtkext/gtkdisplaypanel.h) | 0 |
12 files changed, 6 insertions, 7 deletions
diff --git a/src/glibext/Makefile.am b/src/glibext/Makefile.am index 860f3b9..ac8668c 100644 --- a/src/glibext/Makefile.am +++ b/src/glibext/Makefile.am @@ -17,7 +17,7 @@ libglibext_la_SOURCES = \ gbinarycursor.h gbinarycursor.c \ gbinportion-int.h \ gbinportion.h gbinportion.c \ - gdisplayoptions.h gdisplayoptions.c \ + displayoptions.h displayoptions.c \ glinecursor-int.h \ glinecursor.h glinecursor.c \ gnhash.h gnhash.c \ @@ -28,9 +28,9 @@ libglibext_la_SOURCES = \ objhole.h \ proto.h \ seq.h seq.c \ - signal.h signal.c \ + _signal.h signal.c \ singleton.h singleton.c \ - linesegment.h linesegment.c \ + linetoken.h linetoken.c \ umemslice-int.h \ umemslice.h umemslice.c diff --git a/src/glibext/signal.h b/src/glibext/_signal.h index 4f0ab4b..4f0ab4b 100644 --- a/src/glibext/signal.h +++ b/src/glibext/_signal.h diff --git a/src/glibext/gdisplayoptions.c b/src/glibext/displayoptions.c index a8f835b..a8f835b 100644 --- a/src/glibext/gdisplayoptions.c +++ b/src/glibext/displayoptions.c diff --git a/src/glibext/gdisplayoptions.h b/src/glibext/displayoptions.h index 1a30e81..1a30e81 100644 --- a/src/glibext/gdisplayoptions.h +++ b/src/glibext/displayoptions.h diff --git a/src/glibext/linesegment.c b/src/glibext/linetoken.c index 192e030..192e030 100644 --- a/src/glibext/linesegment.c +++ b/src/glibext/linetoken.c diff --git a/src/glibext/linesegment.h b/src/glibext/linetoken.h index 4859fbb..4859fbb 100644 --- a/src/glibext/linesegment.h +++ b/src/glibext/linetoken.h diff --git a/src/gtkext/rendering.c b/src/glibext/tokenstyle.c index 8badf21..8badf21 100644 --- a/src/gtkext/rendering.c +++ b/src/glibext/tokenstyle.c diff --git a/src/gtkext/rendering.h b/src/glibext/tokenstyle.h index 9adfe1a..9adfe1a 100644 --- a/src/gtkext/rendering.h +++ b/src/glibext/tokenstyle.h diff --git a/src/gtkext/Makefile.am b/src/gtkext/Makefile.am index 9d3d16c..331375f 100644 --- a/src/gtkext/Makefile.am +++ b/src/gtkext/Makefile.am @@ -13,8 +13,6 @@ libgtkext_la_SOURCES = \ gtkblockdisplay.h gtkblockdisplay.c \ gtkbufferdisplay-int.h \ gtkbufferdisplay.h gtkbufferdisplay.c \ - gtkdisplaypanel-int.h \ - gtkdisplaypanel.h gtkdisplaypanel.c \ gtkdockable-int.h \ gtkdockable.h gtkdockable.c \ gtkdockstation.h gtkdockstation.c \ @@ -23,7 +21,6 @@ libgtkext_la_SOURCES = \ hexdisplay.h hexdisplay.c \ named-int.h \ named.h named.c \ - rendering.h rendering.c \ resources.h resources.c \ support.h support.c \ tiledgrid.h tiledgrid.c \ @@ -35,13 +32,15 @@ libgtkext_la_LIBADD = \ libgtkext_la_CFLAGS = $(LIBGTK_CFLAGS) $(LIBXML_CFLAGS) -UI_FILES_4_ = \ +RES_FILES = \ hexview.css \ hexview.ui libgtkext4_la_SOURCES = \ area-int.h \ area.h area.c \ + contentview-int.h \ + contentview.h contentview.c \ hexview.h hexview.c \ resources.h resources.c diff --git a/src/gtkext/gtkdisplaypanel-int.h b/src/gtkext/contentview-int.h index 221d796..221d796 100644 --- a/src/gtkext/gtkdisplaypanel-int.h +++ b/src/gtkext/contentview-int.h diff --git a/src/gtkext/gtkdisplaypanel.c b/src/gtkext/contentview.c index 0f93178..0f93178 100644 --- a/src/gtkext/gtkdisplaypanel.c +++ b/src/gtkext/contentview.c diff --git a/src/gtkext/gtkdisplaypanel.h b/src/gtkext/contentview.h index 58d460f..58d460f 100644 --- a/src/gtkext/gtkdisplaypanel.h +++ b/src/gtkext/contentview.h |