fixed for new GNOME icons

git-svn-id: svn://luxion/repos/URLQueue/trunk@337 fcb26f47-9200-0410-b104-b98ab5b095f3

3 files changed, 36 insertions, 49 deletions

diff --git a/lib/URLQueue/MainController.pm b/lib/URLQueue/MainController.pm
index d76350f..8078612 100644
--- a/lib/URLQueue/MainController.pm
+++ b/lib/URLQueue/MainController.pm
@@ -33,7 +33,7 @@ sub drag_motion {
     $context->status($context->suggested_action,$time);
 
     if (!$self->{_dragging}) {
-        $self->{input}->set('icon-name'=>'stock_book_open');
+        $self->{input}->set('icon-name'=>'gnome-stock-book-open');
         $self->{_dragging}=1;
     }
 
@@ -44,7 +44,7 @@ sub drag_leave {
     my ($self, $widget, $context, $time) = @_;
 
     if ($self->{_dragging}) {
-        $self->{input}->set('icon-name'=>'stock_book_green');
+        $self->{input}->set('icon-name'=>'gnome-stock-book-green');
         $self->{_dragging}=0;
     }
 
@@ -55,7 +55,7 @@ sub drag_drop {
     my ($self, $widget, $context, $x, $y, $time) = @_;
 
     if (my $atom=$context->targets) {
-        $self->{input}->set('icon-name'=>'stock_book_yellow');
+        $self->{input}->set('icon-name'=>'gnome-stock-book-yellow');
         $widget->drag_get_data($context, $atom, $time);
         return 1;
     }
@@ -76,7 +76,7 @@ sub drag_data_received {
         warn "What is $info??";
     }
 
-    $self->{input}->set('icon-name'=>'stock_book_green');
+    $self->{input}->set('icon-name'=>'gnome-stock-book-green');
 
     return 1;
 }
@@ -94,7 +94,7 @@ sub button_release {
     my ($self,$widget,$event)=@_;
 
     if ($event->button==2) {
-        $self->{input}->set('icon-name'=>'stock_book_yellow');
+        $self->{input}->set('icon-name'=>'gnome-stock-book-yellow');
         my $clipboard=Gtk2::Clipboard->get(Gtk2::Gdk->SELECTION_PRIMARY);
         $clipboard->request_text(sub{$self->handle_text($_[1])});
         return 1;
@@ -175,7 +175,7 @@ $body
 EOM
 
     my $sender=Email::Send->new({mailer=>'SMTP'});
-    $sender->mailer_args([Host=>'exelion']);
+    $sender->mailer_args([Host=>'luxion']);
     $sender->send($message);
 }
 
diff --git a/lib/URLQueue/main.glade b/lib/URLQueue/main.glade
index bde7b30..5ca5320 100644
--- a/lib/URLQueue/main.glade
+++ b/lib/URLQueue/main.glade
@@ -1,44 +1,28 @@
-<?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
-
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
+<!--*- mode: xml -*-->
 <glade-interface>
-
-<widget class="GtkWindow" id="main">
-  <property name="width_request">50</property>
-  <property name="height_request">50</property>
-  <property name="visible">True</property>
-  <property name="title" translatable="yes">URLQueue</property>
-  <property name="type">GTK_WINDOW_TOPLEVEL</property>
-  <property name="window_position">GTK_WIN_POS_NONE</property>
-  <property name="modal">False</property>
-  <property name="resizable">True</property>
-  <property name="destroy_with_parent">False</property>
-  <property name="icon_name">stock_bookmark</property>
-  <property name="decorated">False</property>
-  <property name="skip_taskbar_hint">False</property>
-  <property name="skip_pager_hint">True</property>
-  <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
-  <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
-  <property name="focus_on_map">True</property>
-  <property name="urgency_hint">False</property>
-  <signal name="destroy" handler="quit" last_modification_time="Mon, 04 Jun 2007 17:51:09 GMT"/>
-
-  <child>
-    <widget class="GtkImage" id="input">
-      <property name="visible">True</property>
-      <property name="icon_size">4</property>
-      <property name="icon_name">stock_book_green</property>
-      <property name="xalign">0.5</property>
-      <property name="yalign">0.5</property>
-      <property name="xpad">0</property>
-      <property name="ypad">0</property>
-      <signal name="drag_data_received" handler="drag_data_received" last_modification_time="Thu, 07 Jun 2007 18:43:05 GMT"/>
-      <signal name="drag_motion" handler="drag_motion" last_modification_time="Thu, 07 Jun 2007 18:43:30 GMT"/>
-      <signal name="drag_drop" handler="drag_drop" last_modification_time="Thu, 07 Jun 2007 18:43:41 GMT"/>
-      <signal name="drag_leave" handler="drag_leave" last_modification_time="Thu, 07 Jun 2007 18:44:15 GMT"/>
-      <signal name="button_release_event" handler="button_release" last_modification_time="Thu, 07 Jun 2007 18:44:51 GMT"/>
-    </widget>
-  </child>
-</widget>
-
+  <widget class="GtkWindow" id="main">
+    <property name="width_request">50</property>
+    <property name="height_request">50</property>
+    <property name="visible">True</property>
+    <property name="events">GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK | GDK_STRUCTURE_MASK</property>
+    <property name="title" translatable="yes">URLQueue</property>
+    <property name="icon_name">stock_bookmark</property>
+    <property name="type_hint">GDK_WINDOW_TYPE_HINT_UTILITY</property>
+    <property name="skip_pager_hint">True</property>
+    <property name="decorated">False</property>
+    <signal name="destroy" handler="quit"/>
+    <child>
+      <widget class="GtkImage" id="input">
+        <property name="visible">True</property>
+        <property name="stock">gnome-stock-book-green</property>
+        <signal name="drag_leave" handler="drag_leave"/>
+        <signal name="drag_motion" handler="drag_motion"/>
+        <signal name="button_release_event" handler="button_release"/>
+        <signal name="drag_data_received" handler="drag_data_received"/>
+        <signal name="drag_drop" handler="drag_drop"/>
+      </widget>
+    </child>
+  </widget>
 </glade-interface>
diff --git a/script/URLQueue.pl b/script/URLQueue.pl
index 6eac301..fceb83d 100644
--- a/script/URLQueue.pl
+++ b/script/URLQueue.pl
@@ -1,9 +1,12 @@
 #!/usr/bin/perl
 use strict;
 use warnings;
-use Gtk2 qw(-init);
+#use Gtk2 qw(-init);
+use Gnome2;
 use URLQueue::MainController;
 
+Gnome2::Program->init('URLQueue','1.0');
+
 my $main_controller=URLQueue::MainController->new();
 
 $main_controller->run;