Commit ae80de89 authored by Uwe Scholz's avatar Uwe Scholz

Remove last remnants of libgnome in the source code, remove dependencies

parent db9e4355
......@@ -37,7 +37,6 @@ dnl ===================
GLIB_REQ=2.44.0
GMODULE_REQ=2.0.0
GTK_REQ=2.24.0
GNOME_REQ=2.0.0
GNOMEUI_REQ=2.4.0
GNOMEVFS_REQ=2.0.0
GNOME_KEYRING_REQ=2.22
......@@ -50,7 +49,6 @@ POPPLER_REQ=0.18
AC_SUBST(GLIB_REQ)
AC_SUBST(GTK_REQ)
AC_SUBST(GNOME_REQ)
AC_SUBST(GNOMEUI_REQ)
AC_SUBST(GNOMEVFS_REQ)
AC_SUBST(GNOME_KEYRING_REQ)
......@@ -78,9 +76,6 @@ PKG_CHECK_MODULES([GMODULE], [gmodule-2.0 >= ${GMODULE_REQ}])
dnl Check for gtk+
PKG_CHECK_MODULES([GTK], [gtk+-2.0 >= ${GTK_REQ}])
dnl Check for libgnome
PKG_CHECK_MODULES([GNOME], [libgnome-2.0 >= ${GNOME_REQ}])
dnl Check for libgnomeui
PKG_CHECK_MODULES([GNOMEUI], [libgnomeui-2.0 >= ${GNOMEUI_REQ}])
......
......@@ -22,7 +22,6 @@ RDEPEND="
unique? ( >=dev-libs/libunique-@UNIQUE_REQ@:1 )
gnome-base/gnome-keyring
>=gnome-base/gnome-vfs-@GNOMEVFS_REQ@
>=gnome-base/libgnome-@GNOME_REQ@
>=gnome-base/libgnomeui-@GNOMEUI_REQ@
>=x11-libs/gtk+-@GTK_REQ@:2
chm? ( dev-libs/chmlib )
......
......@@ -27,8 +27,6 @@
#include <gdk/gdkkeysyms.h>
#include <gdk-pixbuf/gdk-pixbuf.h>
#include <gtk/gtk.h>
#include <libgnome/gnome-config.h>
#include <libgnome/gnome-exec.h>
#include <libgnomeui/gnome-app-helper.h>
#include <libgnomevfs/gnome-vfs.h>
#include <libgnomevfs/gnome-vfs-mime-handlers.h>
......
......@@ -798,58 +798,6 @@ inline GtkWidget *scale_pixbuf (GdkPixbuf *pixbuf, GtkIconSize icon_size)
return gtk_image_new_from_pixbuf (pixbuf);
}
// Creates a pixmap appropriate for items
GtkWidget *create_ui_pixmap (GtkWidget *unused, GnomeUIPixmapType pixmap_type, gconstpointer pixmap_info, GtkIconSize icon_size)
{
GtkWidget *pixmap = NULL;
char *name;
switch (pixmap_type)
{
case GNOME_APP_PIXMAP_STOCK:
pixmap = gtk_image_new_from_stock (static_cast<const gchar *>(pixmap_info), icon_size);
break;
case GNOME_APP_PIXMAP_DATA:
if (pixmap_info)
{
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_xpm_data ((const char **) pixmap_info);
if (pixbuf != NULL)
{
pixmap = scale_pixbuf (pixbuf, icon_size);
g_object_unref (pixbuf);
}
}
break;
case GNOME_APP_PIXMAP_NONE:
break;
case GNOME_APP_PIXMAP_FILENAME:
name = gnome_program_locate_file (gnome_program_get (), GNOME_FILE_DOMAIN_APP_PIXMAP,
static_cast<const gchar *>(pixmap_info), TRUE, NULL);
if (!name)
g_warning ("Could not find GNOME pixmap file %s", (char *) pixmap_info);
else
{
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (name, NULL);
pixmap = scale_pixbuf (pixbuf, icon_size);
g_object_unref (pixbuf);
g_free (name);
}
break;
default:
g_assert_not_reached ();
g_warning ("Invalid pixmap_type %d", (int) pixmap_type);
}
return pixmap;
}
inline void transform (gchar *s, gchar from, gchar to)
{
gint len = strlen (s);
......
......@@ -207,11 +207,6 @@ gboolean app_needs_terminal (GnomeCmdFile *f);
gchar *get_temp_download_filepath (const gchar *fname);
void remove_temp_download_dir ();
GtkWidget *create_ui_pixmap (GtkWidget *window,
GnomeUIPixmapType pixmap_type,
gconstpointer pixmap_info,
GtkIconSize size);
gchar *unix_to_unc (const gchar *path);
GdkColor *gdk_color_new (gushort r, gushort g, gushort b);
GList *file_list_to_uri_list (GList *files);
......
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