]> Pileus Git - ~andy/gtk/commitdiff
gtk-demo: Remove demo_find_file() function
authorBenjamin Otte <otte@redhat.com>
Fri, 1 Feb 2013 16:38:08 +0000 (17:38 +0100)
committerBenjamin Otte <otte@redhat.com>
Fri, 1 Feb 2013 16:44:13 +0000 (17:44 +0100)
It's not used anymore. With it, the demo-common.h header is not needed
anymore and is removed, too (and all the needless includes).

17 files changed:
demos/gtk-demo/Makefile.am
demos/gtk-demo/appwindow.c
demos/gtk-demo/assistant.c
demos/gtk-demo/builder.c
demos/gtk-demo/changedisplay.c
demos/gtk-demo/demo-common.h [deleted file]
demos/gtk-demo/iconview.c
demos/gtk-demo/iconview_edit.c
demos/gtk-demo/images.c
demos/gtk-demo/main.c
demos/gtk-demo/pixbufs.c
demos/gtk-demo/printing.c
demos/gtk-demo/textscroll.c
demos/gtk-demo/textview.c
demos/gtk-demo/theming_custom_css.c
demos/gtk-demo/theming_style_classes.c
demos/gtk-demo/toolpalette.c

index 165fdbcbf2dd98ee8af8b4f8b1e415b5e86fbdb8..109a4de6274c654897c0cf9f7491614ba88cda70 100644 (file)
@@ -93,7 +93,6 @@ demos.h: @REBUILD@ $(demos) geninclude.pl
 
 gtk3_demo_SOURCES =            \
        $(demos)                \
-       demo-common.h           \
        demo_resources.c        \
        main.c                  \
        demos.h
index ffd17218665e9fa1a3ba4574add8b982ef4f7ba6..e076075dd7a2a182325194fdaa4c495f8e39440a 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <gtk/gtk.h>
 #include "config.h"
-#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 static GtkWidget *infobar = NULL;
index 7d7fbcd0542070bd2852ebad3e247f1726909432..b461171c65179062c946f9cf3c355af9c99c9e95 100644 (file)
@@ -6,7 +6,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "demo-common.h"
 
 static GtkWidget *assistant = NULL;
 static GtkWidget *progress_bar = NULL;
index 663fffd91e4c19f3e63f1f679426a0f758e134c5..7aeff37c5d979585b734015b53fa87acd9753b04 100644 (file)
@@ -4,7 +4,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "demo-common.h"
 
 static GtkBuilder *builder;
 
index f38819d490b6d9b7197d298c5cf0da798dd97d40..16d49fe1e52b77a2680158f45afec55ed246570d 100644 (file)
@@ -31,7 +31,6 @@
 #undef GDK_DISABLE_DEPRECATED
 
 #include <gtk/gtk.h>
-#include "demo-common.h"
 
 /* The ChangeDisplayInfo structure corresponds to a toplevel window and
  * holds pointers to widgets inside the toplevel window along with other
diff --git a/demos/gtk-demo/demo-common.h b/demos/gtk-demo/demo-common.h
deleted file mode 100644 (file)
index 636fc4d..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-#ifndef __DEMO_COMMON_H__
-#define __DEMO_COMMON_H__
-
-G_BEGIN_DECLS
-
-gchar *demo_find_file (const gchar  *base,
-                      GError      **err);
-
-G_END_DECLS
-
-#endif /* __DEMO_COMMON_H__ */
index 179c832e32e5c74aadfc0398d8d5cd73f1ad4447..d54527b1f36022ac4426b95a4c302cafb2374281 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
-#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 
index 2e7d4a01306f0bd748cbe61c218251b23306db7a..0487e5274acdf2008df723f6eacd44111a85fb98 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <gtk/gtk.h>
 #include <string.h>
-#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 
index ef63f37a4dfe228cfe2a0162def9f9a52cad315d..d29ea97adb7b5d2159b7757f3b6f5b38ca393691 100644 (file)
@@ -16,7 +16,6 @@
 #include <glib/gstdio.h>
 #include <stdio.h>
 #include <errno.h>
-#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 static GdkPixbufLoader *pixbuf_loader = NULL;
index d9e090eb917427a56a350c45c15bff097d92d4d8..e428a39f6ad2027be0432ff04642c843b3748c8e 100644 (file)
@@ -32,65 +32,6 @@ struct _CallbackData
   GtkTreePath *path;
 };
 
-#ifdef G_OS_WIN32
-
-#undef DEMOCODEDIR
-
-static char *
-get_democodedir (void)
-{
-  static char *result = NULL;
-
-  if (result == NULL)
-    {
-      result = g_win32_get_package_installation_directory_of_module (NULL);
-      if (result == NULL)
-        result = "unknown-location";
-
-      result = g_strconcat (result, "\\share\\gtk-3.0\\demo", NULL);
-    }
-
-  return result;
-}
-
-#define DEMOCODEDIR get_democodedir ()
-
-#endif
-
-/**
- * demo_find_file:
- * @base: base filename
- * @err:  location to store error, or %NULL.
- *
- * Looks for @base first in the current directory, then in the
- * location GTK+ where it will be installed on make install,
- * returns the first file found.
- *
- * Return value: the filename, if found or %NULL
- */
-gchar *
-demo_find_file (const char *base,
-                GError    **err)
-{
-  g_return_val_if_fail (err == NULL || *err == NULL, NULL);
-
-  if (g_file_test ("gtk-logo-rgb.gif", G_FILE_TEST_EXISTS) &&
-      g_file_test (base, G_FILE_TEST_EXISTS))
-    return g_strdup (base);
-  else
-    {
-      char *filename = g_build_filename (DEMOCODEDIR, base, NULL);
-      if (!g_file_test (filename, G_FILE_TEST_EXISTS))
-        {
-          g_set_error (err, G_FILE_ERROR, G_FILE_ERROR_NOENT,
-                       "Cannot find demo data file \"%s\"", base);
-          g_free (filename);
-          return NULL;
-        }
-      return filename;
-    }
-}
-
 static void
 window_closed_cb (GtkWidget *window, gpointer data)
 {
index 3f4f896abe757204f18867693d771f67c2c97cae..e46abc2d822cb3a886016284f50ed74b9a36f47f 100644 (file)
@@ -16,8 +16,6 @@
 #include <gtk/gtk.h>
 #include <math.h>
 
-#include "demo-common.h"
-
 #define FRAME_DELAY 50
 
 #define BACKGROUND_NAME "/pixbufs/background.jpg"
index 3650ea58345e17dfbd22490c04a2544a958ada58..cc6473fb0e771f4ec632cc486354692da1ced732 100644 (file)
@@ -7,7 +7,6 @@
 
 #include <math.h>
 #include <gtk/gtk.h>
-#include "demo-common.h"
 
 /* In points */
 #define HEADER_HEIGHT (10*72/25.4)
index dae9b4334895c0bd6ce0eed5e2e6d4c12c2b8291..277609bca184df1f4d776a83583a97d9ed510f76 100644 (file)
@@ -6,7 +6,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "demo-common.h"
 
 /* Scroll to the end of the buffer.
  */
index 31aeea62eb20fe11df6c545bdf5362ebf53210de..c4017908036df86714ca4b910c119dd35dfd1724 100644 (file)
@@ -10,8 +10,6 @@
 #include <gtk/gtk.h>
 #include <stdlib.h> /* for exit() */
 
-#include "demo-common.h"
-
 static void easter_egg_callback (GtkWidget *button, gpointer data);
 
 static void
index 20fb4e12218b8ba903ef6e686641206a2435f71e..fb557eb12bc56e1ec11e48946f259383b5c8511a 100644 (file)
@@ -10,7 +10,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 
index a70d73f97e8ca0ce47e07c9669f13a4e46dbe9d7..0dc2dda00a76299663d9f4600aaaa1d3812c0b92 100644 (file)
@@ -9,7 +9,6 @@
  */
 
 #include <gtk/gtk.h>
-#include "demo-common.h"
 
 static GtkWidget *window = NULL;
 
index 95ece8da9835df39bab4b1d941d9f13b0b5a67a1..25d05eebc73ceeeef2f6af90c4c0fec4c9acee3c 100644 (file)
@@ -7,7 +7,6 @@
 #include <string.h>
 #include <gtk/gtk.h>
 #include "config.h"
-#include "demo-common.h"
 
 static GtkWidget *window = NULL;