1 files changed, 13 insertions, 13 deletions

diff --git a/lib/network/connection_manager/gtk.pm b/lib/network/connection_manager/gtk.pm
index 8fe7851..5eb73ef 100644
--- a/lib/network/connection_manager/gtk.pm
+++ b/lib/network/connection_manager/gtk.pm
@@ -5,9 +5,9 @@ use base qw(network::connection_manager);
 use strict;
 use common;
 
-use mygtk2;
-use ugtk2 qw(:create :helpers :wrappers);
-use Gtk2::SimpleList;
+use mygtk3;
+use ugtk3 qw(:create :helpers :wrappers);
+use Gtk3::SimpleList;
 use network::signal_strength;
 use locale; # for cmp
 
@@ -27,16 +27,16 @@ sub new {
 
 sub start_connection {
     my ($cmanager) = @_;
-    gtkset_mousecursor_wait($cmanager->{gui}{w}{window}->window);
+    gtkset_mousecursor_wait($cmanager->{gui}{w}{window}->get_window);
     $cmanager->SUPER::start_connection;
-    gtkset_mousecursor_normal($cmanager->{gui}{w}{window}->window);
+    gtkset_mousecursor_normal($cmanager->{gui}{w}{window}->get_window);
 }
 
 sub stop_connection {
     my ($cmanager) = @_;
-    gtkset_mousecursor_wait($cmanager->{gui}{w}{window}->window);
+    gtkset_mousecursor_wait($cmanager->{gui}{w}{window}->get_window);
     $cmanager->SUPER::stop_connection;
-    gtkset_mousecursor_normal($cmanager->{gui}{w}{window}->window);
+    gtkset_mousecursor_normal($cmanager->{gui}{w}{window}->get_window);
 }
 
 sub select_network {
@@ -57,7 +57,7 @@ sub create_networks_list {
         return;
     }
 
-    $cmanager->{gui}{networks_list} = Gtk2::SimpleList->new(
+    $cmanager->{gui}{networks_list} = Gtk3::SimpleList->new(
         "AP" => "hidden",
         '' => "pixbuf",
         N("SSID") => "text",
@@ -122,11 +122,11 @@ sub update_on_status_change {
             $cmanager->{connection} && (
                 !$cmanager->{connection}->can('get_networks') ||
                 $cmanager->{connection}->get_status || #- always allow to disconnect if connected
-                $cmanager->{connection}{network}
+                $cmanager->{connection}{network} || 0
             ));
     }
 
-    $cmanager->{gui}{buttons}{connect_start}->set_sensitive($cmanager->{connection} && (!$cmanager->{connection}->get_status || $cmanager->{connection}{network}))
+    $cmanager->{gui}{buttons}{connect_start}->set_sensitive($cmanager->{connection} && (!$cmanager->{connection}->get_status || $cmanager->{connection}{network}) || 0)
       if $cmanager->{gui}{buttons}{connect_start};
     $cmanager->{gui}{buttons}{connect_stop}->set_sensitive($cmanager->{connection} && $cmanager->{connection}->get_status)
       if $cmanager->{gui}{buttons}{connect_stop};
@@ -150,7 +150,7 @@ sub update_on_status_change {
 
     if ($cmanager->{gui}{status_image} && $cmanager->{connection}) {
         my $icon = $cmanager->{connection}->get_status_icon;
-        ugtk2::_find_imgfile($icon) or $icon = $cmanager->{connection}->get_type_icon;
+        ugtk3::_find_imgfile($icon) or $icon = $cmanager->{connection}->get_type_icon;
         gtkset($cmanager->{gui}{status_image}, file => $icon);
     }
 }
@@ -186,7 +186,7 @@ sub update_networks_list {
         if ($cmanager->{gui}{show_unique_network}) {
             gtkset($cmanager->{gui}{networks_list}, children => [
                 1, $network_name,
-                0, Gtk2::Image->new_from_pixbuf($strength_pixbuf),
+                0, Gtk3::Image->new_from_pixbuf($strength_pixbuf),
             ]);
             $cmanager->{connection}{network} = $network_name;
         } else {
@@ -210,7 +210,7 @@ sub update_networks_list {
 sub setup_dbus_handlers {
     my ($cmanagers, $connections, $on_network_event, $dbus) = @_;
     network::connection_manager::setup_dbus_handlers($cmanagers, $connections, $on_network_event, $dbus);
-    dbus_object::set_gtk2_watch_helper($dbus);
+    dbus_object::set_gtk3_watch_helper($dbus);
 }
 
 1;