debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Don't use GJS types here, it isn't actually used

Browse source
This commit is contained in:
Christian Dywan 2009-01-01 04:05:26 +01:00
parent 5d7dc29842
commit dcd6714d23
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
midori/midori-browser.c
View file

@ -27,7 +27,6 @@
#include "gtkiconentry.h" #include "gtkiconentry.h"
#include "compat.h" #include "compat.h"
#include "sokoke.h" #include "sokoke.h"
#include "gjs.h"
#include <glib/gi18n.h> #include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h> #include <gdk/gdkkeysyms.h>
@ -2068,7 +2067,7 @@ _action_location_secondary_icon_released (GtkAction* action,
KatzeArray* news_feeds; KatzeArray* news_feeds;
GtkWidget* menu; GtkWidget* menu;
guint n, i; guint n, i;
GjsValue* feed; KatzeItem* feed;
const gchar* uri; const gchar* uri;
const gchar* title; const gchar* title;
GtkWidget* menuitem; GtkWidget* menuitem;
@ -2086,12 +2085,9 @@ _action_location_secondary_icon_released (GtkAction* action,
if (!(feed = katze_array_get_nth_item (news_feeds, i))) if (!(feed = katze_array_get_nth_item (news_feeds, i)))
continue; continue;
uri = gjs_value_get_attribute_string (feed, "href"); uri = katze_item_get_uri (feed);
if (gjs_value_has_attribute (feed, "title")) title = katze_item_get_name (feed);
title = gjs_value_get_attribute_string (feed, "title"); if (!(title && *title))
else
title = uri;
if (!*title)
title = uri; title = uri;
menuitem = sokoke_image_menu_item_new_ellipsized (title); menuitem = sokoke_image_menu_item_new_ellipsized (title);
/* FIXME: Get the real icon */ /* FIXME: Get the real icon */