[gnome-panel] [fish] Port to GtkBuilder
- From: Vincent Untz <vuntz src gnome org>
- To: svn-commits-list gnome org
- Cc:
- Subject: [gnome-panel] [fish] Port to GtkBuilder
- Date: Tue, 11 Aug 2009 13:59:56 +0000 (UTC)
commit 455402b7ac60d820d8b89bc1ce713f6a95a228fd
Author: Vincent Untz <vuntz gnome org>
Date: Tue Aug 11 15:11:43 2009 +0200
[fish] Port to GtkBuilder
applets/fish/Makefile.am | 12 +-
applets/fish/fish.c | 57 +++--
applets/fish/fish.glade | 668 ----------------------------------------------
applets/fish/fish.ui | 444 ++++++++++++++++++++++++++++++
configure.in | 2 +-
po/POTFILES.in | 2 +-
6 files changed, 485 insertions(+), 700 deletions(-)
---
diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am
index 910941b..f99b3e4 100644
--- a/applets/fish/Makefile.am
+++ b/applets/fish/Makefile.am
@@ -4,7 +4,7 @@ INCLUDES = \
-I$(top_builddir)/libpanel-applet \
-DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
-DFISH_ICONDIR=\""$(fishbitmapsdir)"\" \
- -DFISH_GLADEDIR=\""$(gladedir)"\" \
+ -DFISH_BUILDERDIR=\""$(uidir)"\" \
$(WARN_CFLAGS) \
$(DISABLE_DEPRECATED_CFLAGS) \
$(FISH_CFLAGS) \
@@ -50,16 +50,16 @@ EXTRA_DIST = \
GNOME_FishApplet_Factory.server.in.in \
fish.schemas.in \
$(ui_DATA) \
- $(glade_DATA)
+ $(xmlui_DATA)
-gladedir = $(datadir)/gnome-panel/glade
-glade_DATA = fish.glade
+uidir = $(datadir)/gnome-panel/ui
+ui_DATA = fish.ui
fishbitmapsdir = $(datadir)/gnome-panel/pixmaps
fishbitmaps_DATA = $(FISH_BITMAPS)
-uidir = $(datadir)/gnome-2.0/ui
-ui_DATA = GNOME_FishApplet.xml
+xmluidir = $(datadir)/gnome-2.0/ui
+xmlui_DATA = GNOME_FishApplet.xml
serverdir = $(libdir)/bonobo/servers
server_in_files = GNOME_FishApplet_Factory.server.in
diff --git a/applets/fish/fish.c b/applets/fish/fish.c
index a788244..b4fda82 100644
--- a/applets/fish/fish.c
+++ b/applets/fish/fish.c
@@ -40,7 +40,6 @@
#include <panel-applet.h>
#include <panel-applet-gconf.h>
#include <gconf/gconf-client.h>
-#include <glade/glade-xml.h>
#define FISH_APPLET(o) (G_TYPE_CHECK_INSTANCE_CAST ((o), \
fish_applet_get_type(), \
@@ -346,7 +345,7 @@ handle_response (GtkWidget *widget,
static void
setup_sensitivity (FishApplet *fish,
- GladeXML *xml,
+ GtkBuilder *builder,
const char *wid,
const char *label,
const char *label_post,
@@ -364,17 +363,17 @@ setup_sensitivity (FishApplet *fish,
}
g_free (fullkey);
- w = glade_xml_get_widget (xml, wid);
+ w = GTK_WIDGET (gtk_builder_get_object (builder, wid));
g_assert (w != NULL);
gtk_widget_set_sensitive (w, FALSE);
if (label != NULL) {
- w = glade_xml_get_widget (xml, label);
+ w = GTK_WIDGET (gtk_builder_get_object (builder, label));
g_assert (w != NULL);
gtk_widget_set_sensitive (w, FALSE);
}
if (label_post != NULL) {
- w = glade_xml_get_widget (xml, label_post);
+ w = GTK_WIDGET (gtk_builder_get_object (builder, label_post));
g_assert (w != NULL);
gtk_widget_set_sensitive (w, FALSE);
}
@@ -413,7 +412,8 @@ display_preferences_dialog (BonoboUIComponent *uic,
FishApplet *fish,
const char *verbname)
{
- GladeXML *xml;
+ GtkBuilder *builder;
+ GError *error;
GtkWidget *button;
GtkFileFilter *filter;
GtkWidget *chooser_preview;
@@ -426,8 +426,17 @@ display_preferences_dialog (BonoboUIComponent *uic,
return;
}
- xml = glade_xml_new (FISH_GLADEDIR "/fish.glade", NULL, NULL);
- fish->preferences_dialog = glade_xml_get_widget (xml, "fish_preferences_dialog");
+ builder = gtk_builder_new ();
+
+ error = NULL;
+ gtk_builder_add_from_file (builder, FISH_BUILDERDIR "/fish.ui", &error);
+ if (error) {
+ g_warning ("Error loading preferences: %s", error->message);
+ g_error_free (error);
+ return;
+ }
+
+ fish->preferences_dialog = GTK_WIDGET (gtk_builder_get_object (builder, "fish_preferences_dialog"));
g_object_add_weak_pointer (G_OBJECT (fish->preferences_dialog),
(void**) &fish->preferences_dialog);
@@ -439,24 +448,24 @@ display_preferences_dialog (BonoboUIComponent *uic,
gtk_dialog_set_default_response (
GTK_DIALOG (fish->preferences_dialog), GTK_RESPONSE_OK);
- fish->name_entry = glade_xml_get_widget (xml, "name_entry");
+ fish->name_entry = GTK_WIDGET (gtk_builder_get_object (builder, "name_entry"));
gtk_entry_set_text (GTK_ENTRY (fish->name_entry), fish->name);
g_signal_connect (fish->name_entry, "changed",
G_CALLBACK (name_value_changed), fish);
- setup_sensitivity (fish, xml,
+ setup_sensitivity (fish, builder,
"name_entry" /* wid */,
"name_label" /* label */,
NULL /* label_post */,
"name" /* key */);
- fish->preview_image = glade_xml_get_widget (xml, "preview_image");
+ fish->preview_image = GTK_WIDGET (gtk_builder_get_object (builder, "preview_image"));
if (fish->pixbuf)
gtk_image_set_from_pixbuf (GTK_IMAGE (fish->preview_image),
fish->pixbuf);
- fish->image_chooser = glade_xml_get_widget (xml, "image_chooser");
+ fish->image_chooser = GTK_WIDGET (gtk_builder_get_object (builder, "image_chooser"));
filter = gtk_file_filter_new ();
gtk_file_filter_set_name (filter, _("Images"));
gtk_file_filter_add_pixbuf_formats (filter);
@@ -477,20 +486,20 @@ display_preferences_dialog (BonoboUIComponent *uic,
g_signal_connect (fish->image_chooser, "selection-changed",
G_CALLBACK (image_value_changed), fish);
- setup_sensitivity (fish, xml,
+ setup_sensitivity (fish, builder,
"image_chooser" /* wid */,
"image_label" /* label */,
NULL /* label_post */,
"image" /* key */);
- fish->command_label = glade_xml_get_widget (xml, "command_label");
- fish->command_entry = glade_xml_get_widget (xml, "command_entry");
+ fish->command_label = GTK_WIDGET (gtk_builder_get_object (builder, "command_label"));
+ fish->command_entry = GTK_WIDGET (gtk_builder_get_object (builder, "command_entry"));
gtk_entry_set_text (GTK_ENTRY (fish->command_entry), fish->command);
g_signal_connect (fish->command_entry, "changed",
G_CALLBACK (command_value_changed), fish);
- setup_sensitivity (fish, xml,
+ setup_sensitivity (fish, builder,
"command_entry" /* wid */,
"command_label" /* label */,
NULL /* label_post */,
@@ -503,39 +512,39 @@ display_preferences_dialog (BonoboUIComponent *uic,
gtk_widget_set_sensitive (fish->command_entry, FALSE);
}
- fish->frames_spin = glade_xml_get_widget (xml, "frames_spin");
+ fish->frames_spin = GTK_WIDGET (gtk_builder_get_object (builder, "frames_spin"));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (fish->frames_spin),
fish->n_frames);
g_signal_connect (fish->frames_spin, "value_changed",
G_CALLBACK (n_frames_value_changed), fish);
- setup_sensitivity (fish, xml,
+ setup_sensitivity (fish, builder,
"frames_spin" /* wid */,
"frames_label" /* label */,
"frames_post_label" /* label_post */,
"frames" /* key */);
- fish->speed_spin = glade_xml_get_widget (xml, "speed_spin");
+ fish->speed_spin = GTK_WIDGET (gtk_builder_get_object (builder, "speed_spin"));
gtk_spin_button_set_value (GTK_SPIN_BUTTON (fish->speed_spin), fish->speed);
g_signal_connect (fish->speed_spin, "value_changed",
G_CALLBACK (speed_value_changed), fish);
- setup_sensitivity (fish, xml,
+ setup_sensitivity (fish, builder,
"speed_spin" /* wid */,
"speed_label" /* label */,
"speed_post_label" /* label_post */,
"speed" /* key */);
- fish->rotate_toggle = glade_xml_get_widget (xml, "rotate_toggle");
+ fish->rotate_toggle = GTK_WIDGET (gtk_builder_get_object (builder, "rotate_toggle"));
gtk_toggle_button_set_active (
GTK_TOGGLE_BUTTON (fish->rotate_toggle), fish->rotate);
g_signal_connect (fish->rotate_toggle, "toggled",
G_CALLBACK (rotate_value_changed), fish);
- setup_sensitivity (fish, xml,
+ setup_sensitivity (fish, builder,
"rotate_toggle" /* wid */,
NULL /* label */,
NULL /* label_post */,
@@ -546,7 +555,7 @@ display_preferences_dialog (BonoboUIComponent *uic,
g_signal_connect (fish->preferences_dialog, "response",
G_CALLBACK (handle_response), fish);
- button = glade_xml_get_widget (xml, "done_button");
+ button = GTK_WIDGET (gtk_builder_get_object (builder, "done_button"));
g_signal_connect_swapped (button, "clicked",
(GCallback) gtk_widget_hide,
fish->preferences_dialog);
@@ -556,7 +565,7 @@ display_preferences_dialog (BonoboUIComponent *uic,
gtk_window_set_resizable (GTK_WINDOW (fish->preferences_dialog), FALSE);
gtk_window_present (GTK_WINDOW (fish->preferences_dialog));
- g_object_unref (xml);
+ g_object_unref (builder);
}
static void
diff --git a/applets/fish/fish.ui b/applets/fish/fish.ui
new file mode 100644
index 0000000..7cd23de
--- /dev/null
+++ b/applets/fish/fish.ui
@@ -0,0 +1,444 @@
+<?xml version="1.0"?>
+<interface>
+ <requires lib="gtk+" version="2.16"/>
+ <!-- interface-naming-policy toplevel-contextual -->
+ <object class="GtkDialog" id="fish_preferences_dialog">
+ <property name="border_width">5</property>
+ <property name="title" translatable="yes">Fish Preferences</property>
+ <property name="type_hint">dialog</property>
+ <property name="has_separator">False</property>
+ <child internal-child="vbox">
+ <object class="GtkVBox" id="dialog-vbox2">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">2</property>
+ <child>
+ <object class="GtkVBox" id="vbox5">
+ <property name="visible">True</property>
+ <property name="border_width">5</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">18</property>
+ <child>
+ <object class="GtkVBox" id="vbox6">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label13">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">General</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox6">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label16">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox7">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkHBox" id="hbox1">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="name_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Name of fish:</property>
+ <property name="use_markup">True</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">name_entry</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="name_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox3">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="command_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Co_mmand to run when clicked:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">command_entry</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="command_entry">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="activates_default">True</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox8">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="label12">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">Animation</property>
+ <attributes>
+ <attribute name="weight" value="bold"/>
+ </attributes>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox7">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkLabel" id="label17">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"> </property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkVBox" id="vbox9">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkImage" id="preview_image">
+ <property name="visible">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox2">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkLabel" id="image_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">1</property>
+ <property name="ypad">6</property>
+ <property name="label" translatable="yes">_File:</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkFileChooserButton" id="image_chooser">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">Select an animation</property>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkHBox" id="hbox8">
+ <property name="visible">True</property>
+ <property name="spacing">12</property>
+ <child>
+ <object class="GtkVBox" id="vbox10">
+ <property name="visible">True</property>
+ <property name="orientation">vertical</property>
+ <property name="spacing">6</property>
+ <property name="homogeneous">True</property>
+ <child>
+ <object class="GtkLabel" id="frames_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Total frames in animation:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">frames_spin</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="speed_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">_Pause per frame:</property>
+ <property name="use_underline">True</property>
+ <property name="mnemonic_widget">speed_spin</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkTable" id="table2">
+ <property name="visible">True</property>
+ <property name="n_rows">2</property>
+ <property name="n_columns">2</property>
+ <property name="column_spacing">6</property>
+ <property name="row_spacing">6</property>
+ <child>
+ <object class="GtkLabel" id="frames_post_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="label" translatable="yes">frames</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="speed_post_label">
+ <property name="visible">True</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="label" translatable="yes">seconds</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="speed_spin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment2</property>
+ <property name="climb_rate">0.10000000149</property>
+ <property name="digits">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkSpinButton" id="frames_spin">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="adjustment">adjustment1</property>
+ <property name="climb_rate">1</property>
+ <property name="numeric">True</property>
+ </object>
+ <packing>
+ <property name="x_options">GTK_FILL</property>
+ <property name="y_options"></property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkCheckButton" id="rotate_toggle">
+ <property name="label" translatable="yes">_Rotate on vertical panels</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_underline">True</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child internal-child="action_area">
+ <object class="GtkHButtonBox" id="dialog-action_area2">
+ <property name="visible">True</property>
+ <child>
+ <object class="GtkButton" id="help_button">
+ <property name="label">gtk-help</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkButton" id="done_button">
+ <property name="label">gtk-close</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="can_default">True</property>
+ <property name="has_default">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_stock">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">end</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ <action-widgets>
+ <action-widget response="-11">help_button</action-widget>
+ <action-widget response="-5">done_button</action-widget>
+ </action-widgets>
+ </object>
+ <object class="GtkAdjustment" id="adjustment1">
+ <property name="value">3</property>
+ <property name="lower">1</property>
+ <property name="upper">255</property>
+ <property name="step_increment">1</property>
+ <property name="page_increment">5</property>
+ </object>
+ <object class="GtkAdjustment" id="adjustment2">
+ <property name="value">1</property>
+ <property name="lower">0.10000000000000001</property>
+ <property name="upper">10</property>
+ <property name="step_increment">0.10000000000000001</property>
+ <property name="page_increment">1</property>
+ </object>
+</interface>
diff --git a/configure.in b/configure.in
index c3bd3ee..d500a84 100644
--- a/configure.in
+++ b/configure.in
@@ -79,7 +79,7 @@ PKG_CHECK_MODULES(LIBPANEL_APPLET, ORBit-2.0 >= $ORBIT_REQUIRED gtk+-2.0 >= $GTK
AC_SUBST(LIBPANEL_APPLET_CFLAGS)
AC_SUBST(LIBPANEL_APPLET_LIBS)
-PKG_CHECK_MODULES(FISH, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED cairo >= $CAIRO_REQUIRED)
+PKG_CHECK_MODULES(FISH, gtk+-2.0 >= $GTK_REQUIRED cairo >= $CAIRO_REQUIRED)
AC_SUBST(FISH_CFLAGS)
AC_SUBST(FISH_LIBS)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8efc58f..92ed0c4 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -15,7 +15,7 @@ applets/clock/org.gnome.clockapplet.mechanism.policy.in
applets/fish/GNOME_FishApplet.xml
applets/fish/GNOME_FishApplet_Factory.server.in.in
applets/fish/fish.c
-applets/fish/fish.glade
+applets/fish/fish.ui
applets/fish/fish.schemas.in
applets/notification_area/GNOME_NotificationAreaApplet.server.in.in
applets/notification_area/GNOME_NotificationAreaApplet.xml
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
